Merge branch 'master' into develop

This commit is contained in:
Griatch 2019-02-20 22:28:07 +01:00
commit a73868376d
7 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}404 - Not Found{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}500 - Internal Server Error{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}Admin{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block header_ext %}
{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block header_ext %}
<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}
Login

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}To Be Implemented{% endblock %}