Merge branch 'develop' of https://github.com/LLK/scratch-www into release/2021-09-01

# Conflicts: # package-lock.json # package.json

Merge branch 'develop' of https://github.com/LLK/scratch-www into release/2021-09-01
# Conflicts: # package-lock.json # package.json
a32af677 · Chris Garrity · 893754fa · 7d250214 · a32af677 · a32af677
Commit a32af677 authored Sep 02, 2021 by Chris Garrity
Expand all Show whitespace changes
Inline Side-by-side

Showing with 36 additions and 85 deletions

package-lock.json package-lock.json +34 -83

package.json package.json +2 -2

No files found.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -130,8 +130,8 @@
    "redux-mock-store": "1.5.4",
    "redux-thunk": "2.0.1",
    "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20210818113752",
+    "scratch-gui": "0.1.0-prerelease.20210902133104",
-    "scratch-l10n": "3.14.20210901031514",
+    "scratch-l10n": "3.14.20210902031520",
    "selenium-webdriver": "3.6.0",
    "slick-carousel": "1.6.0",
    "style-loader": "0.12.3",