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
..
2017-05-08 15:56:00 +02:00
2018-10-25 00:09:45 +02:00
2018-01-28 22:48:09 +09:00
2018-01-22 14:20:58 +01:00
2018-02-01 07:33:54 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2018-05-03 19:12:09 +09:00