Files · a1cd212fd000d226769e935b00f56aa609a5f8d8 · Wyh / supplier

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

# Conflicts:
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
#	table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

committed Feb 22, 2020

a1cd212f

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