bopol 5b541cc9fb resolve merge conflicts		2020-02-15 14:53:05 +01:00
..
src	resolve merge conflicts	2020-02-15 14:53:05 +01:00
.gitignore	New version number 0.6.0 and some fixes:	2015-11-10 20:51:39 +01:00
build.gradle	Merge branch 'dev' into localisation	2020-02-15 14:14:33 +01:00
proguard-rules.pro	Show parsed relative times instead of whatever the service gives us	2019-11-17 23:58:55 -03:00