mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-14 09:25:09 +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. |
||
---|---|---|
.. | ||
authorizations_controller.rb | ||
authorized_applications_controller.rb | ||
tokens_controller.rb |