Charlie Qiu c63f6b2ee3 Merge branch 'pr/159' into develop ...

# Conflicts:
#	ShadowsocksX-NG/Base.lproj/MainMenu.xib

2017-01-10 15:23:13 +08:00

..

project.xcworkspace

Initial Commit

2016-06-05 21:29:13 +08:00

xcshareddata/xcschemes

Update Alamofire to 4.2.0 with new version of Xcode 8.1

2016-12-11 17:17:36 +08:00

project.pbxproj

Merge branch 'pr/159' into develop

2017-01-10 15:23:13 +08:00