From 0923a3abed096cb53184df74191ac7197d6cd52f Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 24 Aug 2017 21:44:50 -0600 Subject: [PATCH] fix redirect on login --- themes/grav/templates/partials/login.html.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig index c89fdaf7..37b16d7f 100644 --- a/themes/grav/templates/partials/login.html.twig +++ b/themes/grav/templates/partials/login.html.twig @@ -16,7 +16,11 @@
{% block form %}{% endblock %} +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes {{ nonce_field('admin-form', 'admin-nonce')|raw }}