Merge branch 'master' into restore_grid_mixins
Conflicts: dist/css/bootstrap.min.css
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
docs-assets/js/holder.js
100755 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
| ... | @@ -20,7 +20,9 @@ | ... | @@ -20,7 +20,9 @@ |
| } | } | ||
| ] | ] | ||
| , "devDependencies": { | , "devDependencies": { | ||
| "grunt": "~0.4.1" | "browserstack-runner": "~0.0.12" | ||
| , "btoa": "~1.1.1" | |||
| , "grunt": "~0.4.1" | |||
| , "grunt-contrib-clean": "~0.5.0" | , "grunt-contrib-clean": "~0.5.0" | ||
| , "grunt-contrib-concat": "~0.3.0" | , "grunt-contrib-concat": "~0.3.0" | ||
| , "grunt-contrib-connect": "~0.5.0" | , "grunt-contrib-connect": "~0.5.0" | ||
| ... | @@ -30,8 +32,7 @@ | ... | @@ -30,8 +32,7 @@ |
| , "grunt-contrib-uglify": "~0.2.4" | , "grunt-contrib-uglify": "~0.2.4" | ||
| , "grunt-contrib-watch": "~0.5.3" | , "grunt-contrib-watch": "~0.5.3" | ||
| , "grunt-html-validation": "~0.1.5" | , "grunt-html-validation": "~0.1.5" | ||
| , "grunt-jekyll": "~0.3.9" | , "grunt-jekyll": "~0.4.0" | ||
| , "grunt-recess": "~0.4.0" | , "grunt-recess": "~0.4.0" | ||
| , "browserstack-runner": "~0.0.12" | |||
| } | } | ||
| } | } |
Please register or sign in to comment