Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
..
2017-07-18 16:38:22 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2017-06-19 11:31:37 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2017-06-19 01:38:50 +02:00
2017-11-18 00:16:48 +01:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2017-04-05 00:29:56 +02:00
2018-10-04 12:36:53 +02:00
2019-03-03 22:18:23 +01:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00