mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '4ad1c5aa71' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
This commit is contained in:
Claire 2023-09-02 13:31:15 +02:00
commit afc3b12217
10 changed files with 79 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/webpacker.yml
View file

@ -59,7 +59,7 @@ development:
# Reference: https://webpack.js.org/configuration/dev-server/
dev_server:
https: false
host: localhost
host: 0.0.0.0
port: 3035
public: localhost:3035
hmr: false