Vavassor 4fd46dff18 resolve merge conflicts		2017-04-21 01:22:08 -04:00
..
src	resolve merge conflicts	2017-04-21 01:22:08 -04:00
.gitignore	google-services.json is back. Hope it makes contributors' time easier.	2017-04-09 23:29:54 -04:00
build.gradle	Profile editor functionally complete.	2017-04-19 00:01:04 -04:00
google-services.json	google-services.json is back. Hope it makes contributors' time easier.	2017-04-09 23:29:54 -04:00
proguard-rules.pro	added proguard config	2017-04-08 00:08:51 +02:00