Merge branch 'v1.5_new' into fod16_ruleroutes-merged

4935a02a · David Schmitz · 3a061637 · 126be77e · 4935a02a
Commit 4935a02a authored 6 years ago by David Schmitz
--- a/templates/registration/activation_complete.txt
+++ b/templates/registration/activation_complete.txt
@@ -2,4 +2,4 @@ Your account with username {{ user.username }} has been activated.

 You may login to FoD using the following URL:

-http://{{ site.domain }}{% url login % }
+http://{{ site.domain }}{% url login %}