This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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		2019-06-24 15:02:59 +02:00
..
activitypub	Raise exception when attempting to serialize local-only statuses	2019-05-30 09:04:12 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
rss	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
manifest_serializer.rb	Improve config serializer for Keybase (#10338)	2019-03-21 23:33:28 +01:00
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	2019-03-25 15:01:09 +01:00
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00