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
..
activitypub	…
rest	…
rss	…
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…