Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		2018-10-30 17:52:08 +01:00
..
assets	…
devise	…
generators	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
templates	…
cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00