Merge branch 'master' into docs_derp
Conflicts: _config.yml docs/_includes/footer.html docs/_includes/nav-main.html docs/_includes/old-bs-docs.html docs/_layouts/default.html docs/_layouts/home.html docs/getting-started.html docs/index.html
Showing
File moved
File moved
File moved
File moved
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
File added
File added
File added
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
| ... | ... | @@ -30,7 +30,7 @@ |
| "grunt-banner": "~0.2.0", | ||
| "grunt-contrib-clean": "~0.5.0", | ||
| "grunt-contrib-concat": "~0.3.0", | ||
| "grunt-contrib-connect": "~0.5.0", | ||
| "grunt-contrib-connect": "~0.6.0", | ||
| "grunt-contrib-copy": "~0.5.0", | ||
| "grunt-contrib-csslint": "~0.2.0", | ||
| "grunt-contrib-jshint": "~0.8.0", | ||
| ... | ... | @@ -38,7 +38,7 @@ |
| "grunt-contrib-qunit": "~0.3.0", | ||
| "grunt-contrib-uglify": "~0.2.7", | ||
| "grunt-contrib-watch": "~0.5.3", | ||
| "grunt-csscomb": "~1.2.1", | ||
| "grunt-csscomb": "~2.0.1", | ||
| "grunt-html-validation": "~0.1.13", | ||
| "grunt-jekyll": "~0.4.1", | ||
| "grunt-jscs-checker": "~0.3.0", | ||
| ... | ... |
Please register or sign in to comment