Merge branch 'master' into lars-chat

2017-01-24 14:26:48 +01:00
parent a88483ae47 ee6b55bd91
commit dbb23922d8
13 changed files with 224 additions and 90 deletions
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -17,7 +17,7 @@
                    // Set default values of a friend.
                    $username = $friend["username"];
                    $userID = $friend["userID"];
-                    $pf = "img/notbad.jpg";
+                    $pf = "img/avatar-standard.png";

                    // Change values if needed.
                    if (!empty($friend["profilepicture"]))