Merge branch 'main' into @kosmydel/ts/OptionsList

DylanDylann · Jan 16, 2024 · 5bb60b8 · 5bb60b8
2 parents 536fc79 + bfb7f22
commit 5bb60b8
Show file tree

Hide file tree

Showing 77 changed files with 802 additions and 10,328 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001042500
-        versionName "1.4.25-0"
+        versionCode 1001042505
+        versionName "1.4.25-5"
     }
 
     flavorDimensions "default"

diff --git a/android/app/src/main/res/drawable/ic_launcher_monochrome.png b/android/app/src/main/res/drawable/ic_launcher_monochrome.png
diff --git a/assets/images/expensify-logo--adhoc.svg b/assets/images/expensify-logo--adhoc.svg
diff --git a/assets/images/expensify-logo--dev.svg b/assets/images/expensify-logo--dev.svg
diff --git a/assets/images/expensify-logo--staging.svg b/assets/images/expensify-logo--staging.svg