Commit 893d092
committed
Merge branch 'main' into v8
# Conflicts:
# CHANGELOG.md
# 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.lock2 files changed
Lines changed: 11 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
11 | 19 | | |
12 | 20 | | |
13 | 21 | | |
| |||
51 | 59 | | |
52 | 60 | | |
53 | 61 | | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | 62 | | |
58 | 63 | | |
59 | 64 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
| |||
0 commit comments