diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-11 22:28:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 22:28:11 +0200 |
| commit | ef925f31a66d1cbc95bff11669d05e2924d8ce85 (patch) | |
| tree | aadbb60d22a196075fe1faaeeae169e5badead57 /app/views/application | |
| parent | b3dd0d276d52042828e11bf325015f5d7f4624ca (diff) | |
| parent | 877e8c9d799eae663526609642e0c0c9a4612bda (diff) | |
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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) |