d8bc868e79
Fix spaces keyboard shortcuts not working for last space
2021-10-06 10:56:11 +01:00
fa800796c7
Respect tombstones in locally known rooms for Space children
2021-10-06 09:41:57 +01:00
651e943b31
Merge branch 'develop' into fayed/fix-verification-dialog
2021-10-05 08:48:52 -04:00
9a16b4636f
Make cross-signing dialog clearer and more context-aware
...
- Don't show loading spinners while waiting for user action
- When checking if there are other devices we can verify against, only
look for devices that are actually cross-signed.
- Adjust displayed options depending on whether other devices and/or
recovery keys exist, and add an option to reset cross-signing keys
if necessary.
- Various minor clarifying adjustments to UI styling/text
Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-05 00:54:20 -04:00
5dede230f1
Merge pull request #6891 from matrix-org/t3chguy/fix/18455
2021-10-01 12:29:23 +01:00
273a895caa
fix logic
2021-10-01 09:25:47 +01:00
b84a0300aa
Fix leaving space via other client leaving you in undefined-land
2021-10-01 08:58:46 +01:00
fe0a68b71e
Merge pull request #6869 from SimonBrandner/task/src-ts
...
Convert `/src` to TS
2021-09-30 12:48:23 -06:00
fbf74bea1b
Merge pull request #6886 from matrix-org/t3chguy/fix/19223
2021-09-29 16:06:14 +01:00
c0b6c001ca
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19192
2021-09-29 15:04:14 +01:00
56745f29c0
Fix spaces null-guard breaking the dispatcher settings watching
2021-09-29 15:01:58 +01:00
0056b282a6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19067
2021-09-29 14:13:04 +01:00
d7aaeb37b9
delint
2021-09-29 14:05:31 +01:00
0e79daee4b
Remove stale new in the spaces beta toast & modal
2021-09-29 11:53:13 +01:00
af8c07a69b
Ensure that sub-spaces aren't considered for notification badges
2021-09-29 11:45:27 +01:00
d7c43c7cf8
Fix space children without specific `order` being sorted after those with one
2021-09-28 15:42:51 +01:00
d71f2345fb
Null guard around the matrixClient in SpaceStore
2021-09-28 10:34:32 +01:00
e2b6c2cbd6
Convert RoomNotifs to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 18:39:57 +02:00
af9429c8a0
Convert ActiveWidgetStore to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 19:57:02 +02:00
2d1d42b90e
Globally replace all console.logs via codemod ( #6827 )
...
This commit replaces all the `console.log` to `logger.log` via an automated script.
Related: vector-im/element-web#18425
2021-09-21 09:48:09 -06:00
e1445f71bd
Convert AppTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-17 18:47:15 +02:00
68768002bb
use more generic room type instead of boolean flag
2021-09-17 10:19:30 +01:00
28bc8010a7
Say Joining space instead of Joining room where we know its a space
2021-09-16 11:20:01 +01:00
4bb9eeb7a5
Convert RoomPreviewBar to Typescript
2021-09-16 11:09:58 +01:00
e17318a364
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-16 10:05:20 +01:00
8921e25815
Merge pull request #6804 from matrix-org/t3chguy/fix/18481
2021-09-16 10:02:06 +01:00
c786ef9f69
Fix space keyboard shortcuts conflicting with native zoom shortcuts
2021-09-14 16:02:14 +01:00
9928079b82
Merge pull request #6797 from matrix-org/t3chguy/fix/19025
2021-09-14 15:56:20 +01:00
919270ff0c
Update src/stores/SpaceStore.tsx
...
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-09-14 15:50:51 +01:00
87c9551507
Fix edge cases around joining new room which does not belong to active space
2021-09-14 12:49:18 +01:00
9a8a453827
tidy
2021-09-10 11:09:46 +01:00
aff9be6120
Surface unsent messages on the sublist notification badge too
2021-09-10 10:58:13 +01:00
bbe714257e
Show unsent message warning on Space panel button
2021-09-10 09:17:31 +01:00
329bc8a89e
Move unsent event badge handling into RoomNotificationState
2021-09-09 13:14:05 +01:00
911ca07da4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-08 15:28:58 +01:00
0d0eea392c
Merge pull request #6746 from matrix-org/t3chguy/fix/10935
2021-09-08 12:55:45 +01:00
0caca49ec0
Fix regressed tab view buttons in space update toast
2021-09-08 10:26:23 +01:00
9533f7c04c
Fix types in release mode again
2021-09-07 18:49:31 +01:00
f4f4686270
tidy up code
2021-09-07 12:07:18 +01:00
c915288044
Respect m.space.parent relations if they hold valid permissions
2021-09-06 14:34:06 +01:00
a688e5b8b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/structures/LoggedInView.tsx
src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
0b07a70b15
Merge pull request #6730 from matrix-org/t3chguy/fix/17974
...
Don't context switch room on SpaceStore ready as it can break permalinks
2021-09-03 16:26:19 +01:00
6590572124
Improve performance of widget startup slightly
...
See https://github.com/matrix-org/matrix-react-sdk/pull/6733#pullrequestreview-745513275
2021-09-02 15:24:23 -06:00
57aa045195
Don't rely on rooms having timelines to use when checking widgets
2021-09-02 14:27:20 -06:00
44b4561b8b
Don't context switch room on SpaceStore ready as it can break permalinks
2021-09-02 13:40:48 +01:00
3046f0ed85
Merge pull request #6684 from matrix-org/travis/cross-room
...
Add support for MSC2762's timeline functionality
2021-09-01 13:28:26 -06:00
bf5fe29448
Merge pull request #6695 from matrix-org/travis/keep-old-out
...
Don't send prehistorical events to widgets during decryption at startup
2021-09-01 13:16:47 -06:00
b86a0dcc15
Merge branch 'develop' into travis/cross-room
2021-09-01 11:29:20 -06:00
3ed76f5de7
Merge pull request #6719 from matrix-org/travis/widgets/no-limits
...
Remove arbitrary limits from send/receive events for widgets
2021-09-01 11:26:15 -06:00
6e7a1e2db7
Merge pull request #6715 from matrix-org/t3chguy/fix/18761
2021-09-01 14:30:17 +01:00
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349
2021-09-01 08:47:10 +01:00
18b7a64910
Remove arbitrary limits from send/receive events for widgets
...
Fixes https://github.com/vector-im/element-web/issues/17994
As per MSC change: aeadae81e2
2021-08-31 13:17:49 -06:00
bbd420096b
don't bother awaiting SpaceStore::setActiveSpace as it is no longer async
2021-08-31 17:03:43 +01:00
bf4ffa965c
Reload suggested rooms if we see the state change down /sync
2021-08-31 16:56:47 +01:00
b814100b98
Fix membership updates to Spaces not applying in real-time
2021-08-31 16:31:10 +01:00
20b6219121
Don't send prehistorical events to widgets during decryption at startup
...
Fixes https://github.com/vector-im/element-web/issues/18060
Tracking a localized read receipt of sorts appears to be the fastest and least complex approach, though not the greatest.
2021-08-26 13:28:48 -06:00
73dd30f919
Merge branch 'develop' into travis/cross-room
2021-08-26 10:48:10 -06:00
470bc0ffe7
Merge pull request #6686 from matrix-org/travis/widget-redact
...
Special case redaction event sending from widgets per MSC2762
2021-08-26 10:47:17 -06:00
cafa52c466
Special case redaction event sending from widgets per MSC2762
...
Fixes https://github.com/vector-im/element-web/issues/18573
See 853bed2157
2021-08-25 22:40:51 -06:00
76cc5bfb7d
Remember all capabilities given to a widget
...
Fixes https://github.com/vector-im/element-web/issues/18786
Instead of replacing the remembered set, we now add to it. This should be safe as the user expectation was previously to remember the capabilities, so we can keep appending to that list.
This commit also moves the utility functions closer to the widget driver as they aren't needed in the dialog anymore.
2021-08-25 22:30:57 -06:00
f912d9d1b4
Appease the linter
2021-08-25 18:25:20 -06:00
289ac34764
Add support for MSC2762's timeline functionality
...
See https://github.com/matrix-org/matrix-widget-api/pull/41
2021-08-25 18:16:40 -06:00
8fd44f0b5e
Merge pull request #6595 from SimonBrandner/fix/rl-resort/110
...
Don't re-sort the room-list based on profile/status changes
2021-08-25 13:37:53 -06:00
77a463e679
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-25 08:53:16 +01:00
78562685bb
Ignore avatar changes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 08:59:42 +02:00
08402cca9f
Merge remote-tracking branch 'upstream/develop' into fix/rl-resort/110
2021-08-25 08:43:27 +02:00
0465815486
ignoreSelfEvent -> shouldCauseReorder
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 08:43:13 +02:00
b7df1127bd
Revert "Use ignoreSelfEvent in the RoomListStore (which doesn't work!)"
...
This reverts commit 0a4a1506d4
2021-08-25 08:38:47 +02:00
e49dc8c8e2
Remove imports too
2021-08-24 13:23:48 -06:00
4790b4fc17
Remove advanced room logging setting
...
Fixes https://github.com/vector-im/element-web/issues/14602
This has proven to be less useful month over month, so it's time for it to go. The initial goal for keeping it was to track stability in the ~6 months post-release, which means it should have left around the start of 2021. At the time, Spaces was on the horizon with room list corruption issues though, so it was put on hold. These days, it's rock solid and doesn't appear to be causing issues. As such, the logging can leave in favour of more specific/targeted logging when we need it.
This might even speed things up as it's not hitting the SettingsStore every 0.2 seconds.
2021-08-24 13:17:12 -06:00
15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089
...
Allow pagination of the space hierarchy and use new APIs
2021-08-23 15:51:34 -06:00
e54191f6b0
Move background-blur to fully css version
2021-08-23 19:26:57 +02:00
ffc7326b0c
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-19 10:44:32 +01:00
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
e5024c4b71
Adapt threading UI to new backend
2021-08-17 10:38:09 +01:00
5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter
...
* origin/develop: (1278 commits)
Add a little padding
Keep number field in focus when pressing dialpad buttons (#6520 )
Remove old version
Fix video call persisting when widget removed
Update link to matrix-js-sdk CONTRIBUTING file (#6557 )
$toast-bg-color -> $system
$system-... -> $system
Iterate PR based on feedback
Remove unnecessary code
Use AccessibleTooltipButton
Just upload the PR object itself
Edit PR Description instead of commenting
publish the right directory
Fix Netflify builds from fork PRs
This doesn't need to be here as it was moved into CallViewButtons
Make scrollbar dot transparent
Iterate PR based on feedback
Don't set hidden RRs labs setting at account level
Add a comment for weirdly placed div
Add full class names to animations.scss
...
2021-08-13 15:12:07 +02:00
3528d87f30
Remove old version
2021-08-12 18:39:11 +01:00
657dcaf989
Fix video call persisting when widget removed
...
Fixes https://github.com/vector-im/element-web/issues/15703
Type: defect
2021-08-12 18:36:57 +01:00
0a209afdc2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
res/css/structures/_SpaceHierarchy.scss
src/components/structures/SpaceHierarchy.tsx
src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
0a4a1506d4
Use ignoreSelfEvent in the RoomListStore (which doesn't work!)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 09:40:26 +02:00
f2dccbc9f7
Use function syntax
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 09:38:57 +02:00
1f98ea4562
Use ignoreSelfEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:02:40 +02:00
ee0eda7947
Add ignoreSelfEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:02:33 +02:00
be85dcd1bf
Delabs Spaces, keeping it as a default-on preference for the time being
2021-08-11 14:52:40 +01:00
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
2d3211ccf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-04 12:14:29 +01:00
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
152c7dc865
Merge pull request #6523 from aaronraimist/fix-mjolnir
2021-08-02 13:48:43 +01:00
81b767ed89
Merge branch 'master' into develop
2021-08-02 13:08:09 +01:00
0923dd37ab
Sanitize untrusted variables from message previews before translation
...
Fixes https://github.com/vector-im/element-web/issues/18314
2021-07-31 11:43:05 -06:00
cf2a4ddde7
Fix typo which broke feature_mjolnir
...
Regressed in b2d9dd7214
2021-07-31 02:11:49 -05:00
3c436c9617
update setting naming to match style
2021-07-30 12:20:02 +01:00
9eb0986353
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +01:00
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
b8781b7552
Merge pull request #6455 from matrix-org/travis/widget-customisation
...
Add customisation point for declaring widget variables
2021-07-28 07:15:45 -06:00
776435f620
Switch all-rooms toggle for spaces to non-feature settings key
2021-07-27 21:17:24 +01:00
0a9d3302ba
Fix home vs all rooms requiring app reload and change default to `home`
...
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
ec173e74e6
Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload
2021-07-27 20:15:40 +01:00
8c073a6439
RoomListStore removeFilter skip triggering update if nothing changed
2021-07-27 17:53:03 +01:00
12461a79e1
Move SettingsStore `setting_updated` dispatch to action enum
2021-07-27 17:19:45 +01:00
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
755007cbee
Conclude labs flags and write more tests
2021-07-27 14:39:14 +01:00
40947a2a68
Simplifie toast handling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
379101e3ff
Remove an unused member
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:09:00 +02:00
07be6dd780
Allow suppliing whole body to toasts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:35:54 +02:00
2c4ab507d6
Merge pull request #6453 from matrix-org/travis/voice-messages/code-cleanup-1
...
Clean up voice messages code
2021-07-23 09:09:12 -06:00
bb0be4ba72
Add customisation point for declaring widget variables
...
Fixes https://github.com/vector-im/element-web/issues/18035 (indirectly; issue is on a non-standard version of Element).
This has an isReady() step because the variable usage code path cannot be made async, so instead we let the async loading state happen in the prepare() stage. This is required for the intended usecase.
2021-07-22 15:43:18 -06:00
eec63574e6
Move src/voice to src/audio for better naming
...
Many of these files are used by Audio and Voice messages.
Fixes https://github.com/vector-im/element-web/issues/18131
2021-07-22 09:26:26 -06:00
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
517e8951ee
Apply suggestions from review
2021-07-22 08:30:18 +05:30
76040c652c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room
2021-07-22 08:25:24 +05:30
a6c432d66f
fix types
...
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
e54a7f0997
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 09:36:25 +01:00
c9a11af26b
Give singletonRoomViewStore a type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +02:00
05028f1997
remove unused import
2021-07-16 09:22:25 +01:00
191591e807
Make the critical sections of the RLS synchronous to avoid needing to mutex everything
2021-07-16 09:15:56 +01:00
32cc48ff7a
Fix issue with room duplication caused by filtering and selecting room using keyboard
...
Wrap sticky room updates in lock to prevent setStickyRoom running in middle of setKnownRooms
2021-07-16 08:49:19 +01:00
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console
2021-07-15 13:50:13 +01:00
59feff3763
Silence RoomListStore possible memory leak warning
2021-07-15 11:49:15 +01:00
50b6c5c557
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
90d380c8ae
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:49 +01:00
421392f339
Exclude state events from widgets reading room events
...
They can request state reading permissions to read state.
2021-07-14 12:48:27 -06:00
5a51b7139c
Merge pull request #6371 from matrix-org/travis/widgets/fix-enc
...
Send clear events to widgets when permitted
2021-07-14 10:34:08 -06:00
c4b03064ae
fix imports
2021-07-14 10:28:45 -06:00
5dc3d09dd8
Use new function name
2021-07-14 10:18:55 -06:00
9495ba001c
Send clear events to widgets when permitted
...
Fixes https://github.com/vector-im/element-web/issues/17615
2021-07-13 23:17:17 -06:00
ae6eaa5acc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
...
Conflicts:
src/components/structures/RoomDirectory.tsx
src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
36ba65b534
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-07-12 13:00:34 +02:00
2ef714b9eb
remove unused import
2021-07-12 10:49:19 +01:00
bd175c6f40
Improve and consolidate typing
2021-07-10 15:43:46 +01:00
a7aa87a9fc
Fix right panel not closing user info when changing rooms
2021-07-09 14:43:07 +01:00
437d53d1cc
Update space children (best effort) when upgrading a room
2021-07-09 08:43:41 +01:00
f412fb44a7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-09 08:13:39 +01:00
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
...
Update import location for types
2021-07-08 09:18:31 +01:00
086a8cbbb3
Update import location for types
...
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
2021-07-07 20:19:52 +01:00
f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:12:19 +02:00
fbac730c62
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-07-06 15:09:55 +02:00
a5cec34bad
Merge branch 'develop' into t3chguy/fix/17686
2021-07-06 14:53:40 +02:00
Michael Telatynski