Merge branch 'master' into fork

This commit is contained in:
sk
2022-05-05 16:06:28 +02:00
87 changed files with 3102 additions and 312 deletions

View File

@@ -9,8 +9,8 @@ android {
applicationId "org.joinmastodon.android"
minSdk 23
targetSdk 31
versionCode 3
versionName '1.0.4-dev+fork.1.1'
versionCode 4
versionName '1.1.0-dev+fork.1.0'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}