mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-04 22:14:34 +00:00
01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |