Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 2f34f2b

Browse files
committed
Merge branch 'trunk' into upstream-2.4.1
# Conflicts: # .github/workflows/main.yml # Common/cpp/Tools/JSIStoreValueUser.cpp # Common/cpp/headers/Tools/JSIStoreValueUser.h # Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java # Example/android/build.gradle # Example/android/gradle.properties # Example/android/gradle/wrapper/gradle-wrapper.properties # Example/android/settings.gradle # Example/ios/Podfile.lock # Example/package.json # Example/yarn.lock # RNReanimated.podspec # android-npm/build.gradle # android/build.gradle # createNPMPackage.sh # ios/native/NativeProxy.mm # ios/native/REAInitializer.h # ios/native/REAInitializer.mm # ios/native/UIResponder+Reanimated.mm # package.json # src/reanimated2/js-reanimated/index.web.ts # yarn.lock
2 parents 3fb35cf + 06051c0 commit 2f34f2b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish to GitHub Pages
33
on:
44
push:
55
branches:
6-
- main
6+
- trunk
77

88
jobs:
99
publish:

0 commit comments

Comments
 (0)