diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-10-10 17:26:08 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-10 17:26:08 +0200 |
commit | 61631f475163c5640a78ff66f0ac6c053cda2f84 (patch) | |
tree | 78920c924924b76872d420c27a8c62fb1b7f6bb7 /app/views/shared | |
parent | bc0399d54dde2ad058a8382fc3edbe5506a92985 (diff) | |
parent | a57ac0723f5918b12838da8373d51706cb461a4e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/_og.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml index 576f47a67..c8f12974e 100644 --- a/app/views/shared/_og.html.haml +++ b/app/views/shared/_og.html.haml @@ -1,5 +1,5 @@ - thumbnail = @instance_presenter.thumbnail -- description ||= strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html')) +- description ||= strip_tags(@instance_presenter.site_short_description.presence || t('about.about_mastodon_html')) %meta{ name: 'description', content: description }/ |