This repository was archived by the owner on Mar 7, 2025. It is now read-only.
Commit 2f34f2b
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.lock1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
0 commit comments