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
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
containers	Add audio uploads (#11123)	2019-06-19 23:42:38 +02:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Add `forceSingleColumn` prop to `<UI />` (#10807)	2019-05-23 01:35:22 +02:00