You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		5 years ago
..
activitypub	Raise exception when attempting to serialize local-only statuses	6 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
rss	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifest_serializer.rb	Improve config serializer for Keybase (#10338)	6 years ago
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	6 years ago
webfinger_serializer.rb	…