Merge branch 'master' into vpw-event

This commit is contained in:
Isaura 2017-03-02 20:30:16 +01:00
commit e4dcf64487

View file

@ -7,6 +7,6 @@
"license": "MIT", "license": "MIT",
"repository": "https://github.com/ZeusWPI/zeus.ugent.be", "repository": "https://github.com/ZeusWPI/zeus.ugent.be",
"dependencies": { "dependencies": {
"bulma": "git://github.com/jgthms/bulma.git#master" "bulma": "0.3.2"
} }
} }