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
..
2019-06-22 01:51:27 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-22 17:26:09 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-22 00:57:48 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2017-11-20 22:13:37 -08:00
2019-06-12 15:56:18 +02:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-09 15:52:42 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 23:46:19 +02:00
2019-06-22 00:57:48 +02:00
2019-06-22 17:26:09 +02:00
2019-06-12 23:46:19 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-18 22:58:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-30 23:09:02 +02:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00