Merge branch 'custom-locales' into 'develop'

Support adding custom locale files at build time See merge request soapbox-pub/soapbox-fe!1070
2022-03-03 22:31:06 +00:00 · 2022-03-03 22:31:06 +00:00 · ed344f712d
commit ed344f712d
parent 3192120211 36ca05c85b
5 changed files with 4 additions and 0 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
--- a/.gitignore
+++ b/.gitignore
@ -16,6 +16,10 @@ yarn-error.log*
 .idea
 .DS_Store
 # Custom build files
 /custom/*
 !/custom/.gitkeep
 # surge.sh
 CNAME
 AUTH
--- a/app/soapbox/locales/messages.js
+++ b/app/soapbox/locales/messages.js
--- a/custom/.gitkeep
+++ b/custom/.gitkeep
--- a/webpack/shared.js
+++ b/webpack/shared.js