Commit d2b419e
committed
Merge branch 'main' into v7
# Conflicts:
# dev-packages/e2e-tests/package.json
# dev-packages/type-check/package.json
# dev-packages/utils/package.json
# lerna.json
# packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java
# packages/core/ios/RNSentryVersion.m
# packages/core/package.json
# packages/core/src/js/version.ts
# performance-tests/TestAppPlain/package.json
# performance-tests/TestAppSentry/package.json
# samples/expo/app.json
# samples/expo/package.json
# samples/react-native-macos/package.json
# samples/react-native/android/app/build.gradle
# samples/react-native/ios/sentryreactnativesample/Info.plist
# samples/react-native/ios/sentryreactnativesampleTests/Info.plist
# samples/react-native/package.json
# yarn.lockFile tree
4 files changed
+5
-5
lines changed- samples
- expo
- react-native
- android/app
- ios
- sentryreactnativesampleTests
- sentryreactnativesample
4 files changed
+5
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
0 commit comments