Skip to content

Commit ec236ea

Browse files
committed
Merge remote-tracking branch 'origin/main' into claude-renderHTMLLeftAlignAndInlineLinks
Co-authored-by: Pujan Shah <Pujan92@users.noreply.github.com> # Conflicts: # src/components/MenuItem.tsx # src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
2 parents 2e7745d + 74d01ed commit ec236ea

284 files changed

Lines changed: 9154 additions & 2404 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# Per-shard key: each shard only instruments the ~1/8 of suites it runs, so a single
4040
# shared key freezes one shard's partial cache for all shards. The hash refreshes the
4141
# cache when dependencies or Babel config change; restore-keys warms it in between.
42-
key: ${{ runner.os }}-jest-${{ matrix.chunk }}-${{ hashFiles('package-lock.json', 'babel.config.js') }}
42+
key: ${{ runner.os }}-jest-${{ matrix.chunk }}-${{ hashFiles('package-lock.json', 'patches/**', 'babel.config.js') }}
4343
restore-keys: ${{ runner.os }}-jest-${{ matrix.chunk }}-
4444

4545
- name: Jest tests

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009041601
115-
versionName "9.4.16-1"
114+
versionCode 1009041604
115+
versionName "9.4.16-4"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

0 commit comments

Comments
 (0)