Merge branch 'joey-testing' into 'master'

Joey testing See merge request !123
2017-01-25 16:21:02 +01:00
parent e1ca3c52ed 4c5ea08614
commit 09dac78eb4
12 changed files with 399 additions and 61 deletions
--- a/website/public/js/registerAndLogin.js
+++ b/website/public/js/registerAndLogin.js
@@ -12,4 +12,4 @@ function bannedAlert(){

 function emailNotConfirmed(){
    alert("Your account has not been verified yet!\nAnother email has been sent to you")
-}
+}