diff options
| author | ThibG <thib@sitedethib.com> | 2018-06-22 00:10:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 00:10:43 +0200 |
| commit | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (patch) | |
| tree | 4ea4874b420a859b706b1187440e2ed103800396 /app/serializers/rest/account_serializer.rb | |
| parent | f0161702d857a2f91d2e51469e8480253ffcd86e (diff) | |
| parent | 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 (diff) | |
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/account_serializer.rb')
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 6adcd7039..3a724aa7c 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -25,7 +25,7 @@ class REST::AccountSerializer < ActiveModel::Serializer end def note - Formatter.instance.simplified_format(object, custom_emojify: true) + Formatter.instance.simplified_format(object) end def url |