diff options
| author | Reverite <github@reverite.sh> | 2019-10-11 14:55:34 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-11 14:55:34 -0700 |
| commit | b63bcefbdf19eece58ae430bce14031d147ab796 (patch) | |
| tree | 9ce7c29898ddf3f4c4af20890492409793d2fb0f /app/views/application | |
| parent | 38afc782051fe6faf06c2c9ca20304dd946cfb5c (diff) | |
| parent | fbe1de114fca16d63ff651425f69eb534ba013e9 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/application')
| -rw-r--r-- | app/views/application/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml index 33e7c96fe..7ec91c06a 100644 --- a/app/views/application/_sidebar.html.haml +++ b/app/views/application/_sidebar.html.haml @@ -3,7 +3,7 @@ = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title .hero-widget__text - %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) + %p= @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html') - if Setting.trends && !(user_signed_in? && !current_user.setting_trends) - trends = TrendingTags.get(3) |