Merge branch 'v0.2' into develop
Yes
s
before fix shop bug
add pods to gitignore
check in Pods again
try add xcuserdata in gitignore
again
aa
ss
normal commit
before merge bugFix_0.2.1
before merge bugFix_0.2.1
qq
aa
merge
ss
after merge with v0.3
before add event
commit
Merge branch 'develop' of https://github.com/iHamburg/KQ into develop

Conflicts:

KQ.xcworkspace/xcuserdata/qing.xcuserdatad/UserInterfaceState.xcuserstat
e
	KQ/ViewController/CityViewController.m
	KQ/ViewController/MainViewController.h
	KQ/ViewController/MainViewController.m
try commit EventViewController