mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 11:00:26 -05:00
b3bf32a21e
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |