tom79 8f6aac6d9f Merge branch 'kasun/fedilab-working' into develop ... # Conflicts: # app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java # app/src/main/res/values/strings.xml		2019-11-16 12:10:28 +01:00
..
fdroid	…
main	Merge branch 'kasun/fedilab-working' into develop	2019-11-16 12:10:28 +01:00
playstore	Fix rate the app	2019-10-22 17:05:19 +02:00