Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

exports

…

two_factor_authentication

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

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

applications_controller.rb

…

base_controller.rb

…

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

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

imports_controller.rb

…

keyword_mutes_controller.rb

…

migrations_controller.rb

Fix migration page style

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

notifications_controller.rb

…

preferences_controller.rb

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

2018-02-09 09:25:53 -06:00

profiles_controller.rb

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

sessions_controller.rb

…

two_factor_authentications_controller.rb

…