huangzhuanghua 1e077a7b0c Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 ...

Conflicts:
	app/src/main/java/com/gh/base/GHPushMessageReceiver.java
	app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
	app/src/main/java/com/gh/common/util/PostCommentUtils.java
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/res/layout/fragment_personal.xml
	app/src/main/res/layout/game_test_item.xml

2017-01-04 16:26:10 +08:00

..

android/support/v7/widget

...

2016-10-25 11:34:32 +08:00

com

Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3

2017-01-04 16:26:10 +08:00