mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
b3bf32a21e
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |