diff options
author | ThibG <thib@sitedethib.com> | 2020-04-20 18:25:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-20 18:25:18 +0200 |
commit | 60f8a63a76f7c866b5338c33a8b897ba022368ca (patch) | |
tree | b816c0e92ade09712e9bcce29716e762f38769c1 /app/views/tags/show.html.haml | |
parent | d5530827c984238f93100ee737ed209d61e316c0 (diff) | |
parent | 221ea4787fe0caf0f8a3238ab95e97aaac8fe360 (diff) |
Merge pull request #1320 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/tags/show.html.haml')
-rw-r--r-- | app/views/tags/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml index 74d44bd7b..d15f119ed 100644 --- a/app/views/tags/show.html.haml +++ b/app/views/tags/show.html.haml @@ -11,5 +11,5 @@ %h1= "##{@tag.name}" %p= t('about.about_hashtag_html', hashtag: @tag.name) -#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }} +#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }} #modal-container |