Vavassor b51628ed00 resolves merge conflict		2017-07-06 22:15:44 -04:00
..
src	resolves merge conflict	2017-07-06 22:15:44 -04:00
.gitignore	Adds a forgotten keystore.	2017-06-02 04:47:22 -04:00
build.gradle	resolves merge conflict	2017-07-06 22:15:44 -04:00
proguard-rules.pro	(proguard) add forgoten rule for jsoup in release	2017-06-08 14:39:48 +02:00