Merge branch 'main' into xero-merge-freeze

Expensify · May 10, 2024 · 4ef107e · 4ef107e
2 parents 447dd75 + 0e8a10d
commit 4ef107e
Show file tree

Hide file tree

Showing 28 changed files with 954 additions and 1,248 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 1001047104
-        versionName "1.4.71-4"
+        versionCode 1001047201
+        versionName "1.4.72-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md