mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
42f36aa55a
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.jsx |