Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
evennia/web/website/templates/website/404.html
View file

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

2
evennia/web/website/templates/website/500.html
View file

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

2
evennia/web/website/templates/website/evennia_admin.html
View file

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

2
evennia/web/website/templates/website/flatpages/default.html
View file

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

2
evennia/web/website/templates/website/registration/logged_out.html
View file

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

2
evennia/web/website/templates/website/registration/login.html
View file

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

2
evennia/web/website/templates/website/tbi.html
View file

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