Commit 5523ffdc by pye52

Merge branch 'new_master' into new_for_phone

parents b354ae59 e1fec8fb
include ':app'
rootProject.name='SmartCanteen'
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