Merge remote-tracking branch 'origin/v3' into v3

This commit is contained in:
Martin Mahner 2018-03-27 19:45:33 +02:00
commit dd0797dd98
2 changed files with 3 additions and 1 deletions

View file

@ -6,7 +6,8 @@
<html>
<head>
<title>{% block title %}{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
{% block meta %}<meta name="robots" content="noindex, nofollow"/>{% endblock %}
<style type="text/css">{% inlinestatic "dpaste.css" %}</style>
</head>
<body {% block body_type %}{%endblock %}>

View file

@ -3,6 +3,7 @@
{% load i18n %}
{% block nav_new %}{% endblock %}
{% block meta %}{% endblock %}
{% block title %}{% trans "dpaste" %}{% endblock %}