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	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	2018-09-17 21:09:59 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00