Merge branch 'main' into production

This commit is contained in:
Mouse Reeve 2021-01-18 13:52:42 -08:00
commit 28a7156f36

View file

@ -52,7 +52,7 @@
{% include 'snippets/toggle/toggle_button.html' with text="Include spoiler alert" icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=status.content_warning %}
</div>
<div class="control">
{% include 'snippets/privacy_select.html' %}
{% include 'snippets/privacy_select.html' with current=reply_parent.privacy%}
</div>
</div>
<div class="column is-narrow">