mastodon/app/models/form
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
..
admin_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
admin_suspension_confirmation.rb
delete_confirmation.rb
migration.rb
status_batch.rb
two_factor_confirmation.rb