Merge remote-tracking branch 'origin/develop' into fe-basename

2021-09-03 13:31:27 -05:00 · 2021-09-03 13:31:27 -05:00 · f8270181ab
commit f8270181ab
parent 66b67440fe 7221ec48ed
14 changed files with 3 additions and 17 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,20 +8,6 @@
 /.vs/
 yarn-error.log*

-/static/packs
-/static/packs-test
-/static/emoji
-/static/index.html
-/static/index.html.gz
-/static/404.html
-/static/404.html.gz
-/static/manifest.json
-/static/manifest.json.gz
-/static/report.html
-/static/sw.js
-/static/instance/**
-!/static/instance/**.example
-!/static/instance/**.example.*
-!/static/instance/**.example/**
-/static-test
-/public
+/static/
+/static-test/
+/public/
--- a/static/instance/about.example/dmca.html
+++ b/static/instance/about.example/dmca.html
--- a/static/instance/about.example/index.html
+++ b/static/instance/about.example/index.html
--- a/static/instance/about.example/privacy.html
+++ b/static/instance/about.example/privacy.html
--- a/static/instance/about.example/tos.html
+++ b/static/instance/about.example/tos.html
--- a/static/instance/soapbox.example.json
+++ b/static/instance/soapbox.example.json
--- a/static/sounds/boop.mp3
+++ b/static/sounds/boop.mp3
--- a/static/sounds/boop.ogg
+++ b/static/sounds/boop.ogg
--- a/static/sounds/chat.mp3
+++ b/static/sounds/chat.mp3
--- a/static/sounds/chat.oga
+++ b/static/sounds/chat.oga
--- a/static/instance/about.example/.gitkeep
+++ b/static/instance/about.example/.gitkeep
--- a/webpack/configuration.js
+++ b/webpack/configuration.js
--- a/webpack/production.js
+++ b/webpack/production.js
--- a/webpack/shared.js
+++ b/webpack/shared.js