XFFruit/AppDelegate/ICRAppDelegate.m · 8140cbe67dddec54d7fdc98cd8e28afa0de1b751 · 张杰 / xffruit · GitLab

Blame History Permalink

Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 8140cbe6
zhu authored Oct 28, 2015
```
Conflicts:
	XFFruit/AppDelegate/ICRAppDelegate.m
	XFFruit/Info.plist
```
8140cbe6

ICRAppDelegate.m 9.58 KB