Commit b86589c8 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !1
parents f563ebb8 039bcd91
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
"scripts": { "scripts": {
"test": "grunt test" "test": "grunt test"
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment