diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-22 20:22:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 20:22:18 +0100 |
| commit | 9f56511860493b770c2e535be0f8ce4777c8d373 (patch) | |
| tree | 681e3e5a0c0206210e71a187a11c010646d82050 /app/serializers | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
| parent | edd54411124b271622d7a2af4efdfe1a0a35cac4 (diff) | |
Merge pull request #965 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/manifest_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb index cc8b9a4d4..28127437d 100644 --- a/app/serializers/manifest_serializer.rb +++ b/app/serializers/manifest_serializer.rb @@ -18,7 +18,7 @@ class ManifestSerializer < ActiveModel::Serializer end def description - strip_tags(object.site_description.presence || I18n.t('about.about_mastodon_html')) + strip_tags(object.site_short_description.presence || I18n.t('about.about_mastodon_html')) end def icons |