tom79 9f711a9be5 Merge branch 'develop' into pixelfed_stories ... # Conflicts: # app/src/main/java/app/fedilab/android/client/APIResponse.java		2020-01-18 15:00:26 +01:00
..
fdroid/release	…
src	Merge branch 'develop' into pixelfed_stories	2020-01-18 15:00:26 +01:00
.gitignore	…
build.gradle	Release 2.28.2	2020-01-05 18:41:02 +01:00
proguard-rules.pro	…