Merge tag 'v3.0.1' into hometown-dev

This commit is contained in:
Darius Kazemi
2019-11-07 10:11:39 -08:00
194 changed files with 2509 additions and 1408 deletions

View File

@ -59,13 +59,12 @@
= link_to root_url, class: 'brand' do
= site_title
- if @instance_presenter.site_short_description.present?
.hero-widget__text
%p
= @instance_presenter.site_short_description.html_safe.presence
= link_to about_more_path do
= t('about.learn_more')
= fa_icon 'angle-double-right'
.hero-widget__text
%p
= @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')
= link_to about_more_path do
= t('about.learn_more')
= fa_icon 'angle-double-right'
.hero-widget__footer
.hero-widget__footer__column