Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
..
2019-05-19 14:39:16 +09:00
2019-04-10 14:50:14 +02:00
2019-04-05 06:12:08 +09: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
2019-04-10 14:49:40 +02:00
2019-03-16 11:23:22 +01:00
2019-04-21 18:44:51 +02:00
2019-04-13 21:23:41 +09:00
2019-05-20 15:42:19 +09:00
2019-03-12 17:34:00 +01:00