-
http://121.42.32.57/root/xffruitzhu authored
Conflicts: XFFruit.xcodeproj/project.pbxproj XFFruit/zh-Hans.lproj/Localizable.strings
6c8790c8
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| Localizable.strings | Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 |