autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v3.0.1' into hometown-dev

Browse Source
This commit is contained in:
Darius Kazemi
2019-11-07 10:11:39 -08:00
parent b2b108a09a c4118ba71b
commit 4f18400f90
194 changed files with 2509 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/application/_sidebar.html.haml
View File

@ -4,7 +4,7 @@
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url, 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)