kehaoyuan cd4ce2aa6b Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev ...

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java

2017-12-19 09:27:48 +08:00

..

src

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

2017-12-19 09:27:48 +08:00

build.gradle

Merge remote-tracking branch 'origin/temp' into dev

2017-12-15 11:00:08 +08:00

gh.keystore

统一暂停，继续下载处理

2016-05-20 16:35:11 +08:00

proguard-fresco.txt

1、systembar tint/switchbutton/mipush做了更新整理

2017-04-25 18:45:10 +08:00

proguard-rules.txt

update libs

2017-12-06 16:15:20 +08:00

sign.properties

整理工程结构，library配置未完全抽离出来

2017-04-21 16:59:29 +08:00

tinker-support.gradle

fix tinker script bug

2017-11-07 10:57:19 +08:00