Merge branch 'master' into develop

src/views/confirm.tpl

@@ -1,14 +1,9 @@
-{{{ if alreadyValidated }}}
-<div class="alert alert-info">
-	<p>[[notifications:email-confirm-error-message-already-validated]]</p>
-{{{ end }}}
-
 {{{ if error }}}
 <div class="alert alert-warning">
 	<p>[[notifications:email-confirm-error-message]]</p>
 {{{ end }}}
 
-{{{ if (!error && !alreadyValidated )}}}
+{{{ if !error }}}
 <div class="alert alert-success">
 	<strong>[[notifications:email-confirmed]]</strong>
 	<p>[[notifications:email-confirmed-message]]</p>