base-module/src · b9c5dcf32325ddfb9f258e106dc1d1982836a3ee · Wyh / supplier

Merge remote-tracking branch 'origin/master' · b9c5dcf3

# Conflicts:
#	login-module/src/main/AndroidManifest.xml
#	main-module/src/main/AndroidManifest.xml
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java

committed Sep 09, 2020

b9c5dcf3

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...