diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 22:20:25 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 22:20:25 +0200 |
commit | bf1d3ae3b83726816c78ca6cb40af24d48390bd9 (patch) | |
tree | 29c156a7d145f2ec88e4bb708d329202598bdf35 /app/views/application/_sidebar.html.haml | |
parent | 71b318dedc5f39382cb15250417429427a69166b (diff) | |
parent | 4da03a298a20e5007718764483544593556a5ed4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/settings.yml
Diffstat (limited to 'app/views/application/_sidebar.html.haml')
-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 3d8832bb4..2ff14b252 100644 --- a/app/views/application/_sidebar.html.haml +++ b/app/views/application/_sidebar.html.haml @@ -3,4 +3,4 @@ = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('preview.jpg'), alt: @instance_presenter.site_title .hero-widget__text - %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) + %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) |