Merge branch 'master' into 'marijn-settings'

# Conflicts: # website/queries/settings.php
2017-01-18 14:52:32 +01:00
parent e73fcd420c 714760871c
commit ab8c12c9d8
16 changed files with 697 additions and 387 deletions
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -10,9 +10,9 @@ function getSettings() {
      `birthdate`,
      `bio`,
      `profilepicture`
-    FROM 
+    FROM
      `user`
-    WHERE 
+    WHERE
      `userID` = :userID
      ");