tom79 e9e2b16b9e Merge branch 'develop' into new_apng_lib ... # Conflicts: # app/src/main/java/app/fedilab/android/client/Entities/Account.java # app/src/main/java/app/fedilab/android/client/Entities/Notification.java		2019-08-13 18:23:24 +02:00
..
fdroid/release	Fix potential crashes	2019-06-08 18:02:32 +02:00
src	Merge branch 'develop' into new_apng_lib	2019-08-13 18:23:24 +02:00
.gitignore	…
build.gradle	Merge branch 'develop' into new_apng_lib	2019-08-13 18:23:24 +02:00
proguard-rules.pro	…