Merge branch 'main' into alfredo-fix-textinput-area

Expensify · Oct 12, 2021 · 57dde06 · 57dde06
2 parents 3232f95 + 24cc6ff
commit 57dde06
Show file tree

Hide file tree

Showing 124 changed files with 3,551 additions and 1,110 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010600
-        versionName "1.1.6-0"
+        versionCode 1001010706
+        versionName "1.1.7-6"
     }
     splits {
         abi {

diff --git a/assets/images/bill.svg b/assets/images/bill.svg
diff --git a/assets/images/briefcase.svg b/assets/images/briefcase.svg
diff --git a/assets/images/circle-hourglass.svg b/assets/images/circle-hourglass.svg
diff --git a/assets/images/concierge.svg b/assets/images/concierge.svg
diff --git a/assets/images/confetti-pop.gif b/assets/images/confetti-pop.gif
diff --git a/assets/images/invoice.svg b/assets/images/invoice.svg
diff --git a/assets/images/luggage.svg b/assets/images/luggage.svg
diff --git a/assets/images/paycheck.svg b/assets/images/paycheck.svg
diff --git a/assets/images/product-illustrations/bank-arrow--pink.svg b/assets/images/product-illustrations/bank-arrow--pink.svg
diff --git a/assets/images/product-illustrations/bank-mouse--green.svg b/assets/images/product-illustrations/bank-mouse--green.svg
diff --git a/assets/images/product-illustrations/bank-user--green.svg b/assets/images/product-illustrations/bank-user--green.svg