Thibaut Girka aaec64a500 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
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-13 16:49:19 +02:00
2019-06-13 16:49:19 +02:00
2019-06-13 16:49:19 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-13 20:17:56 +02:00
2019-06-13 16:49:19 +02:00
2019-06-13 20:17:56 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-13 20:17:56 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 23:46:19 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00