mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-10-11 07:30:16 +00:00
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |