Files · 090ceca02a87805544916c9395821fb495903421 · huangzhicong / SmartCanteen · GitLab

History Find file

Merge branch 'develop' into fea-phone · 090ceca0

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java
#	build.gradle

committed May 14, 2020

Name	Last commit	Last Update
app		Loading commit data...
daemon		Loading commit data...
.gitignore		Loading commit data...
README.md		Loading commit data...
build.gradle		Loading commit data...
gradle.properties		Loading commit data...
gradlew		Loading commit data...
gradlew.bat		Loading commit data...
settings.gradle		Loading commit data...
智慧食堂开发文档.docx		Loading commit data...