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/release	Fix potential crashes	2019-06-08 18:02:32 +02:00
src	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
.gitignore	…
build.gradle	Release beta 2.25.0-beta-2	2019-11-13 17:04:51 +01:00
proguard-rules.pro	…