mobile / yh_vendor · Commits

# Conflicts:
#	js/Vendor.js
#	js/constants/actionTypes.js
#	js/reducers/index.js
#	js/services/HomeService.js

review -于良

# Conflicts:
#	js/reducers/guide/guideActions.js
#	js/reducers/user/userActions.js

Conflicts:
	js/Vendor.js
	js/constants/actionTypes.js
	js/constants/config.js