Commit c1a9a02
committed
Merge branch 'release51' into release52
# Conflicts:
# meteor/package.json
# meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts
# meteor/server/api/deviceTriggers/observer.ts
# meteor/yarn.lock
# package.json
# packages/blueprints-integration/package.json
# packages/corelib/package.json
# packages/documentation/docs/user-guide/features/access-levels.md
# packages/documentation/package.json
# packages/job-worker/package.json
# packages/lerna.json
# packages/live-status-gateway/package.json
# packages/mos-gateway/package.json
# packages/openapi/package.json
# packages/package.json
# packages/playout-gateway/package.json
# packages/server-core-integration/package.json
# packages/shared-lib/package.json
# packages/yarn.lockFile tree
16 files changed
+321
-166
lines changed- .github/workflows
- meteor
- server
- api/deviceTriggers
- publications/lib
- packages
- blueprints-integration
- documentation/docs
- for-developers
- user-guide/features
- mos-gateway
- openapi
- playout-gateway
- server-core-integration
- scripts
16 files changed
+321
-166
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
758 | 758 | | |
759 | 759 | | |
760 | 760 | | |
761 | | - | |
| 761 | + | |
762 | 762 | | |
763 | 763 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
5 | 15 | | |
6 | 16 | | |
7 | 17 | | |
| |||
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
43 | 47 | | |
44 | | - | |
45 | 48 | | |
46 | 49 | | |
47 | 50 | | |
| |||
173 | 176 | | |
174 | 177 | | |
175 | 178 | | |
| 179 | + | |
176 | 180 | | |
177 | 181 | | |
0 commit comments