mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-29 01:53:12 +00:00
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
---|---|---|
.. | ||
challenges_controller.rb | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb | ||
setup_controller.rb |