aboutsummaryrefslogtreecommitdiff
path: root/rpki/gui/app/templates/registration/password_reset_complete.html
AgeCommit message (Collapse)Author
2016-07-18Remove "import url from future" from Django templates. Fixes #823.Rob Austein
svn path=/branches/tk705/; revision=6446
2014-04-07Pull tk674 changes from trunk. Required manual conflict resolutionRob Austein
because of tree changes in this (tk685) branch; with luck the subversion mergeinfo will record what happened as I intended, but if something horrible happens when this is merged back to trunk, you'll know why. Manual diff of affected files against trunk looks good. svn path=/branches/tk685/; revision=5766