Skip to content

Commit

Permalink
Merge branch 'main' into fix/39673-prevent-multiple-open-report
Browse files Browse the repository at this point in the history
  • Loading branch information
bernhardoj committed May 13, 2024
2 parents 5c0d651 + cf14505 commit 3f124c7
Show file tree
Hide file tree
Showing 81 changed files with 1,413 additions and 2,111 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.10.0
20.13.0
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001047201
versionName "1.4.72-1"
versionCode 1001047300
versionName "1.4.73-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"
Expand Down
92 changes: 0 additions & 92 deletions docs/articles/new-expensify/settings/Profile.md

This file was deleted.

6 changes: 6 additions & 0 deletions docs/articles/new-expensify/workspaces/Coming-Soon.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Coming Soon!
description: More info coming soon!
---

<!-- The lines above are required by Jekyll to process the .md file -->
149 changes: 0 additions & 149 deletions docs/articles/new-expensify/workspaces/The-Free-Plan.md

This file was deleted.

4 changes: 2 additions & 2 deletions ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.72</string>
<string>1.4.73</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.4.72.1</string>
<string>1.4.73.0</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.72</string>
<string>1.4.73</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.4.72.1</string>
<string>1.4.73.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleShortVersionString</key>
<string>1.4.72</string>
<string>1.4.73</string>
<key>CFBundleVersion</key>
<string>1.4.72.1</string>
<string>1.4.73.0</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3f124c7

Please sign in to comment.