Vavassor daf0ec8e49 resolves merge conflict		2017-05-07 20:20:59 -04:00
..
src	resolves merge conflict	2017-05-07 20:20:59 -04:00
.gitignore	Release 1.1.3	2017-05-03 21:49:53 -04:00
build.gradle	resolves merge conflict	2017-05-07 20:20:59 -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