tom79 d70e9b07b7 Merge branch 'develop' into pixelfed_stories ... # Conflicts: # app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java # app/src/main/java/app/fedilab/android/client/PixelfedAPI.java # app/src/main/java/app/fedilab/android/helper/Helper.java # app/src/main/res/values/strings.xml		2019-11-15 16:39:45 +01:00
..
fdroid	fix error when uploading image	2019-06-14 17:37:20 +08:00
main	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
playstore	Fix rate the app	2019-10-22 17:05:19 +02:00