Merge branch 'docs-flows'

# Conflicts:
#	passbook/core/templates/partials/form_horizontal.html

passbook/admin/templates/administration/stage/list.html

@@ -62,6 +62,8 @@
                         <ul>
                             {% for flow in stage.flow_set.all %}
                             <li><a href="{% url 'passbook_admin:flow-update' pk=flow.pk %}">{{ flow.slug }}</a></li>
+                            {% empty %}
+                            <li>-</li>
                             {% endfor %}
                         </ul>
                     </td>

passbook/admin/templates/generic/update.html

@@ -6,7 +6,7 @@
 {% block above_form %}
 <h1>
     {% blocktrans with type=form|form_verbose_name|title inst=form.instance %}
-    Update {{ type }}: {{ inst }}
+    Update {{ inst }}
     {% endblocktrans %}
 </h1>
 {% endblock %}