mirror of https://github.com/Siphonay/mastodon
22cfab0ebf
Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes. |
||
---|---|---|
.. | ||
admin | ||
filters | ||
filters_controller.rb | ||
instances_controller.rb | ||
media_controller.rb | ||
search_controller.rb | ||
suggestions_controller.rb |