Thibaut Girka 20d01a954e 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 Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +02:00
..
activitypub	Add blurhash (#10630)	2019-04-27 03:24:09 +02:00
rest	Serialize content-type on Delete & Redraft	2019-05-17 23:51:14 +02:00
rss
web
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb