Skip to content

O
Opple-iOS
Commit 54c5c4e2 authored by 曹云霄's avatar 曹云霄
Browse files
Options

Merge branch 'master' into WXCard 

# Conflicts:
#	Class/OrderdetailsViewController.m
parents 9a73f9c8 ab139e43
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
Lighting/Info.plist
View file @ 54c5c4e2
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>1.2.1</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
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