Merge branch 'master' into 'kevin-prototype'

# Conflicts: # website/queries/friendship.php # website/queries/user.php
2017-01-18 16:22:29 +01:00
parent 3ee5488a88 fddeba821d
commit 99bffc6f47
35 changed files with 1683 additions and 571 deletions
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -27,4 +27,4 @@ function selectAllFriends($db, $userID) {
    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
    $stmt->execute();
    return $stmt;
-}
+}