diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-05 20:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 20:53:07 +0200 |
| commit | e4ca5414a37b7973247a283a364b27052c8f9d1c (patch) | |
| tree | dcb7769320c5a35b229ef579a20aa2fff209ea94 /app/serializers/rest | |
| parent | 2c2f649200ba5b742ba9d17ac5ba553c752b59aa (diff) | |
| parent | eef8802325d75b2668b131a765c5555f4be8c2ce (diff) | |
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest')
| -rw-r--r-- | app/serializers/rest/media_attachment_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb index 51011788b..1b3498ea4 100644 --- a/app/serializers/rest/media_attachment_serializer.rb +++ b/app/serializers/rest/media_attachment_serializer.rb @@ -5,7 +5,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer attributes :id, :type, :url, :preview_url, :remote_url, :text_url, :meta, - :description + :description, :blurhash def id object.id.to_s |