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

Conflicts:
	data.json
This commit is contained in:
Gilles Jacobs 2014-12-09 23:46:13 +01:00
commit 40491d9060

View file

@ -330,8 +330,8 @@
"saturday": false, "saturday": false,
"sunday": false "sunday": false
}, },
, "type": "HUB-KAHO Campus Gent",
"type": "HUB-KAHO Campus Gent" "extra": false
} }
}, },
{ {