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
..
2017-05-08 15:56:00 +02:00
2018-09-13 03:44:08 +02:00
2017-09-19 03:27:08 +02:00
2018-01-28 22:48:09 +09:00
2018-01-22 14:20:58 +01:00
2017-12-08 01:59:44 +01:00
2017-04-21 19:15:25 +02:00
2018-01-18 07:00:23 +09:00
2018-01-28 22:48:09 +09:00
2018-01-27 08:51:03 +09:00
2018-02-01 07:33:54 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-05-03 19:12:09 +09:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00