Merge main and resolve conflict

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
Expensify · Apr 29, 2024 · 4a9648c · 4a9648c
2 parents dd2b879 + 377121a
commit 4a9648c
Show file tree

Hide file tree

Showing 229 changed files with 6,310 additions and 3,957 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 1001046700
-        versionName "1.4.67-0"
+        versionCode 1001046800
+        versionName "1.4.68-0"
         // 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/assets/images/invoice-generic.svg b/assets/images/invoice-generic.svg
diff --git a/docs/articles/expensify-classic/connect-credit-cards/Global-Reimbursements.md b/docs/articles/expensify-classic/connect-credit-cards/Global-Reimbursements.md
diff --git a/docs/articles/expensify-classic/copilots-and-delegates/Approval-Workflows.md b/docs/articles/expensify-classic/copilots-and-delegates/Approval-Workflows.md