mirror of https://github.com/glitch-soc/mastodon
![]() Conflicts: - `app/lib/content_security_policy.rb`: Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to glitch-soc's `EXTRA_DATA_HOST`. Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`. |
||
---|---|---|
.. | ||
admin | ||
filters | ||
notifications | ||
filters_spec.rb | ||
instance_spec.rb | ||
media_spec.rb | ||
notifications_spec.rb | ||
search_spec.rb | ||
suggestions_spec.rb |