mirror of https://github.com/Siphonay/mastodon
246c313d45
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. |
||
|---|---|---|
| .. | ||
| admin_settings.rb | ||
| admin_suspension_confirmation.rb | ||
| delete_confirmation.rb | ||
| migration.rb | ||
| status_batch.rb | ||
| two_factor_confirmation.rb | ||