luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 12:52:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
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
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
policies
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00