Merge remote-tracking branch 'origin/master' into markdown-refact

This commit is contained in:
Matteo Nastasi 2017-10-01 11:27:57 +02:00
commit 2bc4d755fa
2 changed files with 0 additions and 11 deletions

View File

@ -1,6 +0,0 @@
{% load i18n %}
<h2>{% trans "Field filters" %}</h2>
<form class="form" action="" method="get">
{{ filter.form.as_p }}
<button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>
</form>

View File

@ -1,5 +0,0 @@
{% load crispy_forms_tags %}
{% load i18n %}
<h2>{% trans "Field filters" %}</h2>
{% crispy filter.form %}