Commit 49294ad
committed
Merge commit '590db1eedc0b3e2178e061ca660717176af4e746' into feature/new-website/updated-assets
# Conflicts:
# docs/public/features/magnifier-color-picker.mp4
# docs/public/features/onboarding-compare.mp4
# docs/public/features/simulator-airplane-mode.mp4
# docs/public/features/user-defaults-editor.mp4
# docs/src/assets/features/floating-window-trimming.png
# docs/src/assets/features/status-bar-overrides.png
# docs/src/collections/feature/asc-drag-drop-video.md
# docs/src/collections/feature/compare-designs.md
# docs/src/collections/feature/environment-overrides.md
# docs/src/collections/feature/floating-window.md
# docs/src/collections/feature/grids.md
# docs/src/collections/feature/location-simulation.md
# docs/src/collections/feature/magnify.md
# docs/src/collections/feature/professional-captures.md
# docs/src/collections/feature/recent-builds.md
# docs/src/collections/feature/recording-example.md
# docs/src/collections/feature/rulers.md
# docs/src/collections/feature/simulator-airplane-mode.md
# docs/src/collections/feature/status-bar-editing.md
# docs/src/collections/feature/user-defaults-editor.mdFile tree
11 files changed
+87
-7
lines changed- docs
- public
- src
- assets/features
- layouts
11 files changed
+87
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
4 | 6 | | |
5 | 7 | | |
6 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
7 | 23 | | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
Loading
Loading
Loading
Loading
Loading
Loading
0 commit comments