Merge branch 'gh-pages' of github.com:GilJ/Bloklocaties into gh-pages

Conflicts: data.json
2014-12-09 23:46:13 +01:00 · 2014-12-09 23:46:13 +01:00 · 40491d9060
commit 40491d9060
parent d89474af2b 58155411aa
1 changed files with 2 additions and 2 deletions
--- a/data.json
+++ b/data.json
@ -330,8 +330,8 @@
            "saturday": false,
            "sunday": false
        },
-        ,
-        "type": "HUB-KAHO Campus Gent"
+        "type": "HUB-KAHO Campus Gent",
+        "extra": false
    }
 },
 {