Commit 019d3625 authored by David黄金龙's avatar David黄金龙

Merge branch 'double11' into develop

* double11:
  修改版本号

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents 12d88457 e72b45b9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment