Merge branch 'master' into glitch-soc/merge-upstream

2019-03-22 13:05:17 +01:00
parent bde9196b70 3411fbef19
commit edd5441112
8 changed files with 17 additions and 15 deletions
--- 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