Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
activitypub	…
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
rss	…
web	…
initial_state_serializer.rb	…
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…