Merge remote-tracking branch 'origin/develop' into develop

2 years ago · c9479aee20
parent 9dc1b881e3 f7f2ac542e
commit c9479aee20
10 changed files with 0 additions and 1 deletions
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@ -32,7 +32,6 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:fitsSystemWindows="true"
-            app:contentScrim="?colorPrimary"
            app:expandedTitleGravity="top"
            app:expandedTitleMarginEnd="64dp"
            app:expandedTitleMarginStart="48dp"
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/1.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/1.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/2.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/2.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/3.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/3.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/4.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/4.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/5.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/5.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/6.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/6.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/7.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/7.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/8.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/8.png
--- a/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/9.png
+++ b/src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/9.png