Merge branch '2.1'

This commit is contained in:
Graham Campbell
2016-02-17 20:08:56 +00:00
6 changed files with 17 additions and 14 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-0a0328c0cc.css",
"dist/js/all.js": "dist/js/all-e705b7b737.js"
"dist/css/all.css": "dist/css/all-d526b8c3c6.css",
"dist/js/all.js": "dist/js/all-9c19e78dd3.js"
}