Merge remote-tracking branch 'origin/lars-algemeen' into hendrik-testing

2017-01-17 15:15:14 +01:00
parent 146fc7108b a8fcbecc2e
commit d1d07ce37d
7 changed files with 176 additions and 95 deletions
--- a/website/public/img/notbad.jpg
+++ b/website/public/img/notbad.jpg
--- a/website/public/js/menu.js
+++ b/website/public/js/menu.js
@@ -1,5 +1,6 @@
 $(document).ready(function() {
    $(".extra-menu-items").hide();
+    $("#menu-back").hide();

    // Show more friends
    $("#more-friends-click").click(function() {
--- a/website/public/template_sql.php
+++ b/website/public/template_sql.php
@@ -4,7 +4,6 @@
 <body>
 <?php

-// database gegevens zijn elders opgeslagen
 include_once("../queries/connect.php");
 include_once("../queries/friendship.php");