stom79 997bba9ce3 Merge branch 'partnership' into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2018-09-01 14:07:07 +02:00
..
playstore/release	Remove useless focus	2018-08-16 14:58:02 +02:00
src	Merge branch 'partnership' into develop	2018-09-01 14:07:07 +02:00
.gitignore	Translation client	2017-11-18 12:36:10 +01:00
build.gradle	Improve follow instance in profile	2018-09-01 09:46:10 +02:00
proguard-rules.pro	initial commit	2017-05-05 16:36:04 +02:00