Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

exports

Remove exports/base controller in favor of shared concern (#3444)

2017-05-30 19:06:01 +02:00

two_factor_authentication

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-21 13:36:10 -06:00

applications_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-23 16:05:19 +02:00

base_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

deletes_controller.rb

Prepend check_enabled_deletion to Settings::DeletesController (#229)

2017-12-06 16:19:43 -06:00

exports_controller.rb

Fix data export page error

2018-02-24 00:29:26 +09:00

flavours_controller.rb

Thank you, Officer Murphy

2018-01-10 12:10:43 -06:00

follower_domains_controller.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-06-12 13:17:21 +00:00

imports_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

migrations_controller.rb

Fix migration page style

2018-03-30 15:26:12 +02:00

notifications_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-03 14:33:06 +02:00

preferences_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

profiles_controller.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-17 11:17:21 +00:00

sessions_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

two_factor_authentications_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00