diff options
| author | Thomas <tschneider.ac@gmail.com> | 2022-11-25 18:21:33 +0100 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2022-11-25 18:21:33 +0100 |
| commit | 27f1d594bb2aac1342901372be703896c708275d (patch) | |
| tree | 354cf491ac1ca85f92c3e706072a5b054d615fc2 | |
| parent | 52ba7ef31c9e32b0d8062f4bdfe29db39ab48f92 (diff) | |
| parent | 5bc122cb5ec2cdfece8ae3f2a704d78237e7f264 (diff) | |
Merge branch 'develop'3.8.0
115 files changed, 4087 insertions, 724 deletions
diff --git a/app/build.gradle b/app/build.gradle index 0b28e4e70..a677471aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { defaultConfig { minSdk 21 targetSdk 31 - versionCode 431 - versionName "3.7.4" + versionCode 433 + versionName "3.8.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } flavorDimensions "default" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a5a34ba2..be259dfde 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -201,7 +201,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/account" /> <activity - android:name=".activities.Admi |