Merge branch 'main' into fix/33875-leave-thread-concierge

Expensify · Jan 17, 2024 · 7a046af · 7a046af
2 parents 7b1035c + 8e2fb67
commit 7a046af
Show file tree

Hide file tree

Showing 127 changed files with 1,507 additions and 10,847 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 1001042407
-        versionName "1.4.24-7"
+        versionCode 1001042504
+        versionName "1.4.25-4"
     }
 
     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/animations/Coin.lottie b/assets/animations/Coin.lottie
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