Files · ad92fa9076883a2554db9cb2eeab9d74bd0e612d · Wyh / supplier

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

# Conflicts:
#	main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	print-module/src/main/java/com/joe/print/mvp/print/Print.java
#	user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

committed Feb 24, 2020

ad92fa90

Name	Last commit	Last Update
android_internal		Loading commit data...
arms		Loading commit data...
cc		Loading commit data...
cc-register		Loading commit data...
chart		Loading commit data...
demo_interceptors		Loading commit data...
download-data		Loading commit data...
main		Loading commit data...
pools		Loading commit data...
print-module		Loading commit data...
public-base		Loading commit data...
public-ui/src/main		Loading commit data...
table-mode		Loading commit data...
user-login		Loading commit data...
.gitignore		Loading commit data...
app.keystore		Loading commit data...
bintray.gradle		Loading commit data...
build.gradle		Loading commit data...
cc-settings.gradle		Loading commit data...
config.gradle		Loading commit data...
gradle.properties		Loading commit data...
gradlew		Loading commit data...
gradlew.bat		Loading commit data...
settings.gradle		Loading commit data...