Merge remote-tracking branch 'refs/remotes/origin/master'

mmit.
This commit is contained in:
Your Name 2016-03-05 19:57:41 +00:00
commit de875f80de
45 changed files with 603 additions and 150 deletions

View file

@ -0,0 +1,5 @@
{% extends "ungleichch/base.html" %}
{% load cms_tags %}
{% block base_content %}
{% placeholder "page_content" %}
{% endblock %}