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-07-09 07:13:59 +02:00
2018-04-21 21:35:07 +02:00
2018-07-05 18:31:35 +02:00
2018-05-11 11:49:12 +02:00
2018-08-10 16:49:06 +02:00
2018-07-05 18:31:35 +02:00
2018-07-05 18:31:35 +02:00
2018-04-21 21:35:07 +02:00
2018-07-05 18:31:35 +02:00
2018-08-10 16:49:06 +02:00
2018-04-21 21:35:07 +02:00
2018-07-05 18:31:35 +02:00
2018-09-28 02:23:45 +02:00
2018-07-05 18:31:35 +02:00
2018-07-05 18:31:35 +02:00
2018-07-05 18:31:35 +02:00
2018-04-21 21:35:07 +02:00
2018-07-05 18:31:35 +02:00
2018-07-05 18:31:35 +02:00
2018-08-27 18:09:28 +02:00
2018-07-05 18:31:35 +02:00
2018-09-28 02:23:45 +02:00
2018-07-05 18:31:35 +02:00
2018-07-05 18:31:35 +02:00
2017-06-05 12:09:29 +02:00
2018-07-03 01:47:56 +02:00