mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-11 16:05:04 +00:00
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 |