Merge branch 'master' into kevin-prototype

2017-01-30 20:19:24 +01:00
parent 3140242b4f 6831994ede
commit 6e6bbf8d92
14 changed files with 303 additions and 117 deletions
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -46,6 +46,7 @@ function selectUser($me, $other) {
          `bio`,
          `user`.`creationdate`,
          `onlinestatus`,
+          `role`,
          `fname`,
          `lname`,
          CASE `status` IS NULL