diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-02 11:57:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 11:57:52 +0200 |
| commit | cf0f8eb742f1e5a7b0bbab261214ee5e9b9de6fe (patch) | |
| tree | 29c156a7d145f2ec88e4bb708d329202598bdf35 /app/views/application | |
| parent | 71b318dedc5f39382cb15250417429427a69166b (diff) | |
| parent | bf1d3ae3b83726816c78ca6cb40af24d48390bd9 (diff) | |
Merge pull request #621 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 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) |