4 Commits

Author	SHA1	Message	Date
Marijn Jansen	e9c883529b	Merge branch 'master' into 'joey-testing' ... # Conflicts: # website/login.php	2017-01-12 15:04:07 +01:00
Marijn Jansen	10558a6877	Merge branch 'master' into marijn-settings	2017-01-12 14:21:28 +01:00
Joey Lai	4cb9a83d62	fixed identation	2017-01-12 14:18:49 +01:00
Joey Lai	5c96744507	Datepicker added	2017-01-12 13:03:46 +01:00