OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
13,379 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

1412 Commits (6e5f2ad66e8266d5dfa4641381d329156fe098ba)

Author SHA1 Message Date
renovate[bot] 6f6fd0c5be
Update babel monorepo to v7.23.4 (#26665) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-28 18:43:43 +00:00
renovate[bot] 3c8df025c1
Update definitelyTyped (#26666) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-28 18:41:57 +00:00
RiotRobot 709049ab7c Upgrade matrix-js-sdk to 30.2.0-rc.0 2023-11-28 17:29:10 +00:00
RiotRobot db513593b4 Upgrade matrix-react-sdk to 3.86.0-rc.2 2023-11-28 17:29:02 +00:00
Michael Telatynski 198ea60677
Fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-11-28 17:26:07 +00:00
Johannes Marbach e8668614a7 Setup CI to lint workflows with action-validator 2023-11-21 19:45:44 +01:00
RiotRobot 23eb48132a Reset matrix-js-sdk back to develop branch 2023-11-21 11:36:19 +00:00
RiotRobot 0ea2091b2d Reset matrix-react-sdk back to develop branch 2023-11-21 11:36:10 +00:00
RiotRobot 2debdda2b3 Merge branch 'master' into develop 2023-11-21 11:35:52 +00:00
RiotRobot af3f25eb4d Upgrade matrix-js-sdk to 30.1.0 2023-11-21 11:21:41 +00:00
RiotRobot c8b916fdff Upgrade matrix-react-sdk to 3.85.0 2023-11-21 11:21:32 +00:00
Johannes Marbach 4e32b6fbe1 Update copy-webpack-plugin to latest 2023-11-16 19:22:34 +01:00
Johannes Marbach a56a2268f0 Merge branch 'develop' into johannes/webpack-5 2023-11-16 19:20:22 +01:00
Johannes Marbach d2fa827fad Replace copy/watching of non-language assets with copy-webpack-plugin 2023-11-16 14:21:45 +01:00
renovate[bot] ec1ff4b606
Update dependency @types/jest to v29.5.8 (#26580) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-11-15 23:11:10 +00:00
renovate[bot] fd9cb159ca
Update babel monorepo to v7.23.3 (#26578) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-11-15 23:06:54 +00:00
renovate[bot] 829c0ec22f
Update definitelyTyped (#26579) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-15 22:49:04 +00:00
dependabot[bot] 3bf7017f37
Bump crypto-js from 4.1.1 to 4.2.0 (#26460) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-15 22:30:10 +00:00
renovate[bot] f9293f92e5
Update all non-major dependencies (#26581) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-15 22:29:33 +00:00
Michael Telatynski 64028270dd
Remove unused dependencies and add transitive deps (#26543) 2023-11-15 22:05:29 +00:00
RiotRobot 613b50a4c6 Upgrade matrix-js-sdk to 30.1.0-rc.1 2023-11-14 16:23:37 +00:00
RiotRobot 4bb0cdf298 Upgrade matrix-react-sdk to 3.85.0-rc.1 2023-11-14 16:23:27 +00:00
Johannes Marbach 432c1d65e1 Squashed commit of the following: 
commit 069c1bc833
Author: Johannes Marbach <johannesm@element.io>
Date:   Sat Nov 11 16:08:30 2023 +0100

    Replace worker-loader with built-in Webpack 5 support for web workers
 2023-11-13 20:18:00 +01:00
Johannes Marbach bbd449f9f4 Merge branch 'develop' into johannes/webpack-5 2023-11-13 20:02:26 +01:00
ElementRobot 6a79993019 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2023-11-13 10:32:03 +00:00
ElementRobot 5928fb9735 Upgrade matrix-js-sdk to 30.0.1 2023-11-13 10:26:44 +00:00
ElementRobot f69b58e797 Upgrade matrix-react-sdk to 3.84.1 2023-11-13 10:26:32 +00:00
Johannes Marbach 37632d84c8 Eliminate worklet-loader 2023-11-09 16:47:01 +01:00
Johannes Marbach e6ba36d1cf Merge branch 'develop' into johannes/webpack-5 2023-11-09 15:43:44 +01:00
Charly Nguyen 99c10cb422
Update @matrix-org/react-sdk-module-api 2023-11-09 11:28:16 +01:00
Johannes Marbach 0a36934d55 Eliminate use of loader-utils 2023-11-08 10:04:09 +01:00
Johannes Marbach 25bb2ae492 Replace optimize-css-assets-webpack-plugin with css-minimizer-webpack-plugin 2023-11-08 09:19:20 +01:00
Johannes Marbach fe46b05bfb Remove unused extract-text-webpack-plugin 2023-11-08 09:16:04 +01:00
Johannes Marbach e271f2cadb Upgrade webpack to 5.89.0 2023-11-08 09:15:27 +01:00
Johannes Marbach 4ffac57990 Merge branch 'develop' into johannes/webpack-5 2023-11-08 08:55:15 +01:00
ElementRobot 8b01798bd6 Reset matrix-js-sdk back to develop branch 2023-11-07 15:26:48 +00:00
ElementRobot 740bf8ae70 Reset matrix-react-sdk back to develop branch 2023-11-07 15:26:41 +00:00
ElementRobot 51f9e52538 Merge branch 'master' into develop 2023-11-07 15:26:26 +00:00
ElementRobot a582cec412 Upgrade matrix-js-sdk to 30.0.0 2023-11-07 15:20:22 +00:00
ElementRobot b2387c3027 Upgrade matrix-react-sdk to 3.84.0 2023-11-07 15:19:34 +00:00
Johannes Marbach 17147ade05 Merge branch 'develop' into johannes/webpack-5 2023-11-06 13:59:38 +01:00
renovate[bot] 61cfe56774
Update all non-major dependencies (#26482) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-01 08:28:54 +00:00
renovate[bot] 5ae434d90d
Update dependency eslint-plugin-unicorn to v49 (#26485) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-31 18:42:32 +00:00
renovate[bot] c4c759c951
Update dependency @types/jest to v29.5.7 (#26480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-31 18:27:58 +00:00
renovate[bot] 8447c77d95
Update definitelyTyped (#26479) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-31 18:15:36 +00:00
ElementRobot 7ec7fb5d98 Upgrade matrix-js-sdk to 30.0.0-rc.1 2023-10-31 15:05:28 +00:00
ElementRobot 12da7c2773 Upgrade matrix-react-sdk to 3.84.0-rc.1 2023-10-31 14:59:24 +00:00
Hubert Chathi 56bdaaf2f2
Use olm from default npm registry, since it's there now (#26461) 2023-10-27 22:37:23 +01:00
dependabot[bot] 1bf3200fc1
Bump browserify-sign from 4.2.1 to 4.2.2 (#26459) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-10-27 13:40:14 +00:00
Michael Telatynski e5d4d5108d
Add script to generate mermaid graph of automations (#26432) 2023-10-27 14:03:30 +01:00
Johannes Marbach 3a73f6baaa Merge branch 'develop' into johannes/webpack-5 2023-10-25 16:51:14 +02:00
Johannes Marbach ca24cde34d Merge branch 'develop' into johannes/webpack-cli-4.10.0 2023-10-25 08:26:55 +02:00
ElementRobot 5eb399276d Reset matrix-js-sdk back to develop branch 2023-10-24 15:47:18 +01:00
ElementRobot aab9e5de01 Reset matrix-react-sdk back to develop branch 2023-10-24 15:47:03 +01:00
ElementRobot b8775f48f7 Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2023-10-24 15:46:10 +01:00
ElementRobot 51cd6cc9e6 Upgrade matrix-js-sdk to 29.1.0 2023-10-24 15:39:33 +01:00
ElementRobot bd151bf42c Upgrade matrix-react-sdk to 3.83.0 2023-10-24 15:39:25 +01:00
Johannes Marbach 98c27c8bd4 Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5 2023-10-24 13:49:35 +02:00
Johannes Marbach 9fce52bf5f Merge branch 'develop' into johannes/webpack-cli-4.10.0 2023-10-24 13:43:58 +02:00
renovate[bot] f8b6364694
Update react-types (#26124) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-19 08:56:39 +01:00
renovate[bot] f1a39b3e4d
Update dependency typescript to v5.2.2 (#26390) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-18 17:02:17 +00:00
renovate[bot] f3bf750bf3
Lock file maintenance (#26205) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-18 17:54:00 +01:00
renovate[bot] 775c4d335e
Update all non-major dependencies (#26201) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-18 17:18:45 +01:00
dependabot[bot] 3930c6cb04
Bump @babel/traverse from 7.22.15 to 7.23.2 (#26381) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-10-18 09:09:29 +00:00
renovate[bot] 0ebfa4174b
Update babel monorepo to v7.23.2 (#26290) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-17 17:38:03 +00:00
Michael Telatynski c27aca4977
Remove @types/modernizr from package.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-17 18:22:12 +01:00
renovate[bot] 76adf57d1d
Update definitelyTyped (#26198) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-17 17:10:41 +00:00
renovate[bot] 7279b05ee4
Update dependency fake-indexeddb to v5 (#26391) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-17 17:00:32 +00:00
ElementRobot 0cd55e1f1b Upgrade matrix-js-sdk to 29.1.0-rc.1 2023-10-17 15:33:37 +01:00
ElementRobot 8419ac62be Upgrade matrix-react-sdk to 3.83.0-rc.1 2023-10-17 15:30:52 +01:00
dependabot[bot] 3b23cb8bff
Bump postcss from 8.4.29 to 8.4.31 (#26306) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Germain <germain@souquet.com>
 2023-10-17 07:44:23 +00:00
Johannes Marbach 0b706bb1de Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5 2023-10-16 07:56:48 +02:00
Johannes Marbach 5b4eea4e09 Merge branch 'develop' into johannes/webpack-cli-4.10.0 2023-10-16 07:53:29 +02:00
RiotRobot b9ea639f9d Reset matrix-react-sdk back to develop branch 2023-10-10 09:36:24 +01:00
RiotRobot 9832921d0d Reset matrix-js-sdk back to develop branch 2023-10-10 09:36:11 +01:00
RiotRobot 27733c364f Upgrade matrix-react-sdk to 3.82.0 2023-10-10 09:28:03 +01:00
RiotRobot 20ad51994a Upgrade matrix-js-sdk to 29.0.0 2023-10-10 09:27:40 +01:00
Andy Balaam 24da65701c
Bump matrix-web-i18n to 3.1.3 for KEY_SEPARATOR (#26287) 2023-10-03 14:44:55 +01:00
RiotRobot 3b47b1b523 Upgrade matrix-react-sdk to 3.82.0-rc.1 2023-10-03 12:08:27 +01:00
RiotRobot fcb961d0ea Upgrade matrix-js-sdk to 29.0.0-rc.1 2023-10-03 12:08:01 +01:00
RiotRobot 260e0fc8ac Reset matrix-react-sdk back to develop branch 2023-09-29 11:31:48 +01:00
RiotRobot 6c305121f4 Reset matrix-js-sdk back to develop branch 2023-09-29 11:31:22 +01:00
RiotRobot b7cca93ceb Merge branch 'master' into develop 2023-09-29 11:30:11 +01:00
RiotRobot c47c598c0b Upgrade matrix-react-sdk to 3.81.1 2023-09-29 11:20:23 +01:00
Johannes Marbach c844d80217 Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5 2023-09-29 11:00:03 +02:00
Johannes Marbach bb04097912 Merge branch 'develop' into johannes/webpack-cli-4.10.0 2023-09-29 10:56:13 +02:00
RiotRobot 1707ecd8b6 Reset matrix-react-sdk back to develop branch 2023-09-26 14:10:03 +01:00
RiotRobot b4cc35b2da Reset matrix-js-sdk back to develop branch 2023-09-26 14:09:47 +01:00
RiotRobot 8492c22b55 Merge branch 'master' into develop 2023-09-26 14:09:32 +01:00
RiotRobot 09291a9cf5 Upgrade matrix-react-sdk to 3.81.0 2023-09-26 13:32:57 +01:00
RiotRobot 9ac837068f Upgrade matrix-js-sdk to 28.2.0 2023-09-26 13:26:28 +01:00
Johannes Marbach af3659a90e Update to webpack 5 2023-09-23 21:34:56 +02:00
Johannes Marbach e0954f330a Update webpack-dev-server to 4.15.1 2023-09-22 20:57:00 +02:00
renovate[bot] 4367299885
Update jest to v29.5.5 (#26200) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-22 01:00:55 +00:00
renovate[bot] c59d0a924b
Update babel monorepo to v7.22.20 (#26199) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-22 00:33:54 +00:00
Johannes Marbach 218a3b478d Update webpack to 4.47.0 / webpack-cli to 4.10.0 2023-09-21 20:47:58 +02:00
RiotRobot 0285eab20c Upgrade matrix-react-sdk to 3.81.0-rc.1 2023-09-19 12:49:42 +01:00
RiotRobot baacd4ca8c Upgrade matrix-js-sdk to 28.2.0-rc.1 2023-09-19 12:49:19 +01:00
RiotRobot e456ca1b20 Reset matrix-react-sdk back to develop branch 2023-09-15 12:13:45 +01:00
RiotRobot 744ff5ca9a Reset matrix-js-sdk back to develop branch 2023-09-15 12:13:30 +01:00
RiotRobot 361941e5d4 Reset matrix-js-sdk back to develop branch 2023-09-13 13:00:58 +01:00
RiotRobot dc6c7022fc Merge branch 'master' into develop 2023-09-13 12:59:06 +01:00
RiotRobot 28a8c1cd1e Upgrade matrix-react-sdk to 3.80.1 2023-09-13 12:44:38 +01:00
ElementRobot b9be840291 Reset matrix-react-sdk back to develop branch 2023-09-12 17:17:24 +01:00
ElementRobot 81b6320595 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2023-09-12 17:16:37 +01:00
ElementRobot c9e5df4aa0 Upgrade matrix-js-sdk to 28.1.0 2023-09-12 17:06:29 +01:00
ElementRobot eec8b37c49 Upgrade matrix-react-sdk to 3.80.0 2023-09-12 17:06:18 +01:00
renovate[bot] 14746004b5
Update babel monorepo to v7.22.17 (#26121) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-12 10:11:23 +01:00
ElementRobot 24d5457518 Upgrade matrix-react-sdk to 3.80.0-rc.2 2023-09-08 12:07:00 +01:00
Michael Telatynski e84e161034
yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-09-08 10:51:22 +01:00
Michael Telatynski c944a273d0
Convert copy-res to typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-09-08 10:33:57 +01:00
renovate[bot] f93a7c0ffe
Update all non-major dependencies (#26036) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-07 08:14:15 +00:00
renovate[bot] 54fd7a9872
Lock file maintenance (#26126) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-06 20:37:35 +01:00
renovate[bot] ee3c1192bc
Update jest to v29.6.4 (#26123) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-06 13:00:34 +01:00
renovate[bot] e94b80b9e5
Update definitelyTyped (#26122) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-06 10:48:36 +01:00
Michael Telatynski c525b633bd
Migrate translations to keys and switch to Localazy (#26106) 2023-09-05 17:17:25 +01:00
ElementRobot 2bfe31e242 Upgrade matrix-js-sdk to 28.1.0-rc.1 2023-09-05 17:02:56 +01:00
ElementRobot c577b95e5e Upgrade matrix-react-sdk to 3.80.0-rc.1 2023-09-05 17:02:45 +01:00
maheichyk 3fd6b62254
Add support for rendering a custom wrapper around Element (#25537) 
Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
 2023-08-30 07:52:41 +01:00
RiotRobot 2ad80c8fcf Reset matrix-react-sdk back to develop branch 2023-08-29 11:25:41 +01:00
RiotRobot c5a90f03d9 Reset matrix-js-sdk back to develop branch 2023-08-29 11:25:23 +01:00
RiotRobot 25460bd8b7 Merge branch 'master' into develop 2023-08-29 11:23:26 +01:00
RiotRobot 61fba2c32c Upgrade matrix-react-sdk to 3.79.0 2023-08-29 11:09:15 +01:00
RiotRobot e870fe2048 Upgrade matrix-js-sdk to 28.0.0 2023-08-29 11:08:30 +01:00
Andy Balaam fcd805255c
Revert "Update react-types (#25256)" (#26048) 
This reverts commit 83b940605e.
because it breaks the build.
 2023-08-24 14:10:26 +00:00
renovate[bot] 83b940605e
Update react-types (#25256) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-24 13:34:21 +00:00
renovate[bot] a3c0324dc6
Lock file maintenance (#26038) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-24 14:15:17 +01:00
renovate[bot] 780da23c70
Update jest to v29.5.4 (#26035) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 14:25:12 +00:00
renovate[bot] b464a7e106
Update dependency @types/node to v16.18.41 (#26034) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:24:10 +01:00
RiotRobot 50f7c1edfb Upgrade matrix-react-sdk to 3.79.0-rc.2 2023-08-23 11:59:58 +01:00
RiotRobot 9c06e33e78 Upgrade matrix-js-sdk to 28.0.0-rc.1 2023-08-23 11:55:44 +01:00
Dominik Henneke 65f7545ba5
Bump @matrix-org/react-sdk-module-api from 1.0.0 to 2.0.0 (#25986) 2023-08-18 12:03:28 +00:00
Michael Telatynski 062e93a5d2
Tidy and improve dev scripts (#25978) 2023-08-18 08:34:56 +01:00
Michael Telatynski 96c652ef08
Switch to nested object pluralisation format for i18n files (#25970) 2023-08-17 09:37:59 +01:00
ElementRobot 6bce017823 Reset matrix-js-sdk back to develop branch 2023-08-15 13:38:45 +01:00
ElementRobot f9b7372883 Reset matrix-react-sdk back to develop branch 2023-08-15 13:38:23 +01:00
ElementRobot 6755448e86 Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2023-08-15 13:37:44 +01:00
ElementRobot 8c33ebfd52 Upgrade matrix-js-sdk to 27.2.0 2023-08-15 13:29:15 +01:00
ElementRobot 70742e0432 Upgrade matrix-react-sdk to 3.78.0 2023-08-15 13:28:41 +01:00
renovate[bot] fb984abf12
Update all non-major dependencies (#25938) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 09:16:12 +01:00
renovate[bot] a61ab7c033
Lock file maintenance (#25940) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-08 15:18:01 +00:00
renovate[bot] 424cbdd47b
Update dependency eslint-config-prettier to v9 (#25939) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-08 14:42:50 +00:00
renovate[bot] f58b122850
Update babel monorepo to v7.22.10 (#25937) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-08 14:32:54 +00:00
ElementRobot 3cce4de454 Upgrade matrix-js-sdk to 27.2.0-rc.1 2023-08-08 15:21:49 +01:00
ElementRobot 84fe974606 Upgrade matrix-react-sdk to 3.78.0-rc.1 2023-08-08 15:20:55 +01:00
RiotRobot 030b1fb339 Reset matrix-react-sdk back to develop branch 2023-08-04 09:41:37 +01:00
RiotRobot 7a3e36d434 Reset matrix-js-sdk back to develop branch 2023-08-04 09:41:15 +01:00
ElementRobot 4f790eb134 Reset matrix-js-sdk back to develop branch 2023-08-01 12:53:01 +01:00
ElementRobot 50ca01f8d0 Reset matrix-react-sdk back to develop branch 2023-08-01 12:52:44 +01:00
ElementRobot 3b37081818 Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2023-08-01 12:51:00 +01:00