Marijn settings #60

Merged

11166932 merged 4 commits from marijn-settings into master 2017-01-18 14:52:38 +01:00

Conversation 3 Commits 4 Files Changed 6

+108 -22

4 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
Marijn Jansen	4fe142eb51	Projectplan added to gitignore	2017-01-18 14:50:11 +01:00
Marijn Jansen	dde463df6c	Added password change	2017-01-18 10:43:54 +01:00