Commit ad76d9c4 authored by cermak's avatar cermak
Browse files

Merge branch 'master' into develop

# Conflicts:
#	app/admin.py
parents f14aae02 a7650bf9
{% extends "layout.html" %}
{% block content %}
<h2>{{ title }}.</h2>
<h3>{{ message }}</h3>
<p>Use this area to provide additional information.</p>
{% endblock %}
{% extends "layout.html" %}
{% block content %}
<h2>{{ title }}.</h2>
<h3>{{ message }}</h3>
<address>
One Microsoft Way<br />
Redmond, WA 98052-6399<br />
<abbr title="Phone">P:</abbr>
425.555.0100
</address>
<address>
<strong>Support:</strong> <a href="mailto:Support@example.com">Support@example.com</a><br />
<strong>Marketing:</strong> <a href="mailto:Marketing@example.com">Marketing@example.com</a>
</address>
{% endblock %}
......@@ -20,4 +20,7 @@
{% crispy form %}
</div>
</div>
{% endblock %}
{% block scripts %}
{{ form.media }}
{% endblock %}
\ No newline at end of file
......@@ -16,4 +16,7 @@
{{ form_errors }}
</div>
</div>
{% endblock %}
{% block scripts %}
{{ form.media }}
{% endblock %}
\ No newline at end of file
......@@ -244,8 +244,6 @@
<Content Include="app\static\app\scripts\respond.js" />
<Content Include="app\static\app\scripts\respond.min.js" />
<Content Include="app\static\app\scripts\_references.js" />
<Content Include="app\templates\app\about.html" />
<Content Include="app\templates\app\contact.html" />
<Content Include="app\templates\app\index.html" />
<Content Include="app\templates\layout.html" />
<Content Include="app\templates\app\loginpartial.html" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment