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
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
v2
web	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
base_controller.rb	Explicitly disable storage of REST API results (#10655)	2019-05-03 20:39:19 +02:00
oembed_controller.rb
proofs_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb