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-04-21 21:35:07 +02:00
2018-08-22 11:53:41 +02:00
2018-10-01 12:43:20 +02:00
2018-09-09 04:10:44 +02:00
2018-09-14 00:53:09 +02:00
2018-09-09 04:10:44 +02:00
2018-07-09 19:19:23 +02:00
2018-05-02 22:28:46 +02:00
2018-07-31 01:14:33 +02:00
2017-05-22 16:29:48 +02:00
2017-05-22 17:58:49 +02:00
2018-04-21 21:35:07 +02:00
2018-08-24 15:10:34 +02:00
2018-08-18 03:03:12 +02:00
2018-09-14 00:53:09 +02:00
2018-06-13 10:28:39 +09:00
2018-06-14 10:49:17 +09:00
2018-03-05 19:29:36 +01:00
2018-08-18 03:03:12 +02:00
2018-05-23 06:32:10 +02:00
2018-04-21 21:35:07 +02:00
2018-04-21 21:35:07 +02:00
2018-04-21 21:35:07 +02:00
2018-06-24 19:55:55 +09:00
2018-06-18 10:45:20 +09:00
2018-04-23 19:27:35 +02:00
2018-09-14 00:53:09 +02:00
2018-04-21 21:35:07 +02:00