5 Commits

Author	SHA1	Message	Date
Marijn Jansen	ab8c12c9d8	Merge branch 'master' into 'marijn-settings' ... # Conflicts: # website/queries/settings.php	2017-01-18 14:52:32 +01:00
Marijn Jansen	e73fcd420c	settings succes mesages	2017-01-18 14:51:03 +01:00
Joey Lai	afcd048260	Almost finished login/register page	2017-01-18 12:35:41 +01:00
Marijn Jansen	dde463df6c	Added password change	2017-01-18 10:43:54 +01:00
Marijn Jansen	11f2297d5a	Setting loadin, settings update, db is now global	2017-01-17 16:47:49 +01:00