Merge branch 'master' into siarheipuhach-feature/flake8

This commit is contained in:
M.Ravi 2017-07-01 15:56:22 +02:00
commit 430ddc4bcb

View file

@ -131,6 +131,8 @@
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</footer>
{% else %}
{% include "datacenterlight/includes/_footer.html" %}
{% endif %}
<!-- jQuery -->
<script src="{% static 'hosting/js/jquery.js' %}"></script>