Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
activitypub	…
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
rss	…
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…