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	Add blurhash (#10630)	2019-04-27 03:24:09 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
rss
web
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb