base-module/src · 1385fdeed3f6cff2b6a728d9c81e8d1e1105f2dd · Wyh / supplier

Merge remote-tracking branch 'origin/master' · 1385fdee

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionManager.java
#	base-module/src/main/res/values/ids.xml
#	login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java

committed Aug 20, 2020

1385fdee

Name	Last commit	Last Update
..
androidTest/java/com/gingersoft/gsa/cloud/base		Loading commit data...
main		Loading commit data...
test/java/com/gingersoft/gsa/cloud/base		Loading commit data...