Skip to content

huangzhicong / SmartCanteen

Go to a project
Commit 05c84cab by patpat
Options

Merge branch 'develop' into production 

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/bgycc/smartcanteen/AppConfig.kt
parents 3333d450 260398db
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment