mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 22:57:11 +00:00
2d029dedd9
Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes. |
||
|---|---|---|
| .. | ||
| development.rb | ||
| production.rb | ||
| test.rb | ||