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	fix error when uploading image	2019-06-14 17:37:20 +08:00
main	Merge branch 'develop' into new_apng_lib	2019-08-13 18:23:24 +02:00
playstore	Fix upload with Google	2019-06-15 17:25:21 +02:00