wangcongtao 9b8695b96f Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml

2020-09-23 14:06:55 +08:00

..

src

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

2020-09-23 14:06:55 +08:00

.gitignore

add media module

2020-06-03 15:57:06 +08:00

build.gradle

proguard of module all close and apply app config

2020-07-20 17:24:01 +08:00

consumer-rules.pro

changed the proguard rules

2020-07-21 14:28:01 +08:00

gradle.properties

add media module

2020-06-03 15:57:06 +08:00

proguard-rules.pro

changed the proguard rules

2020-07-21 14:28:01 +08:00