Unverified Commit fa41164e authored by Max Lv's avatar Max Lv Committed by GitHub

Merge branch 'master' into room

parents 3190ff5e 36c72e20
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
sdkVersion = 27 sdkVersion = 27
buildToolsVersion = '27.0.3' buildToolsVersion = '27.0.3'
supportLibraryVersion = '27.1.1' supportLibraryVersion = '27.1.1'
takisoftFixVersion = '27.1.1.0' takisoftFixVersion = '27.1.1.1'
roomVersion = '1.1.0' roomVersion = '1.1.0'
playServicesVersion = '12.0.1' playServicesVersion = '12.0.1'
junitVersion = '4.12' junitVersion = '4.12'
......
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 to comment