mirror of https://github.com/tootsuite/mastodon
246c313d45
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| omniauth_callbacks_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||