Thibaut Girka
c91d9b7389
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
2018-10-01 12:43:20 +02:00
..
2018-09-28 02:11:14 +02:00
2018-09-23 20:42:13 +02:00
2018-10-01 12:43:20 +02:00
2018-05-04 13:26:25 +02:00
2018-07-31 18:59:34 +02:00
2018-09-18 16:45:58 +02:00
2018-08-18 03:03:12 +02:00
2017-09-25 23:05:54 +02:00
2018-09-18 16:45:58 +02:00
2018-07-28 19:25:33 +02:00
2018-07-28 19:25:33 +02:00
2018-05-03 17:23:44 -05:00
2018-09-18 16:45:58 +02:00
2017-04-11 01:11:41 +02:00
2018-09-28 02:11:14 +02:00
2018-02-16 07:22:20 +01:00
2018-03-19 20:12:20 +01:00
2017-09-17 15:23:44 +02:00
2018-07-28 19:25:33 +02:00
2018-08-18 03:03:12 +02:00
2018-07-28 19:25:33 +02:00
2018-10-01 12:43:20 +02:00
2018-07-31 18:59:34 +02:00
2017-11-20 22:13:37 -08:00
2018-10-01 12:43:20 +02:00
2018-05-11 18:12:42 +02:00
2018-03-19 20:07:47 +01:00
2018-08-18 03:03:12 +02:00