Thomas 87c0fcfd1b Merge branch 'develop' of framagit.org:tom79/fedilab into develop ... Conflicts: app/src/main/assets/changelogs/373.txt		2020-06-19 18:04:23 +02:00
..
src	Merge branch 'develop' of framagit.org:tom79/fedilab into develop	2020-06-19 18:04:23 +02:00
.gitignore	…
build.gradle	Release 2.35.8	2020-06-15 19:14:11 +02:00
proguard-rules.pro	…