Anthony Cicchetti 3e296ad74f Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml		2018-11-30 14:16:41 -05:00
..
codeStyles	Added syncLibs command, does DependencyVersions way better.	2018-11-02 20:45:32 -04:00
.name	Updated Android SDK version	2018-04-04 22:03:45 -04:00
gradle.xml	Added syncLibs command, does DependencyVersions way better.	2018-11-02 20:45:32 -04:00
kotlinc.xml	???	2018-11-30 14:13:45 -05:00
kotlinScripting.xml	Added kotlin DSL buildscripts for common and buildSrc	2018-09-03 13:12:01 -04:00
misc.xml	???	2018-11-30 14:13:45 -05:00
modules.xml	Created buildSrc directory, updated gradle versions, changed buildscripts to be independent of one another (no more allprojects and subprojects blocks)	2018-08-03 22:50:41 -04:00
vcs.xml	???	2018-11-30 14:13:45 -05:00