Merge branch 'master' into donations

# Conflicts: # mastodon/build.gradle
2024-07-01 00:57:35 +03:00
parent 027b873f13 f9fd62db09
commit 188da6dbf7
13 changed files with 369 additions and 300 deletions
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,8 +13,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 34
-		versionCode 105
-		versionName "2.5.2"
+		versionCode 107
+		versionName "2.5.4"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}