diff options
| author | Chris Rebert <[email protected]> | 2015-01-21 13:00:12 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-21 13:00:12 -0800 |
| commit | 9238337cbbad3bc45fa036f5f1ed63dec86d2968 (patch) | |
| tree | a1fa418cb91eb698d97db9ed0745f86488383f99 /package.json | |
| parent | 9e0c4ff786217d585f427de5c7a3f87ac86f3648 (diff) | |
| parent | 1ce502dc4de0accf27a6c37c21d26f4739d09241 (diff) | |
| download | bootstrap-9238337cbbad3bc45fa036f5f1ed63dec86d2968.tar.xz bootstrap-9238337cbbad3bc45fa036f5f1ed63dec86d2968.zip | |
Merge branch 'master' into v4
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index e8a25e111..37e156ab9 100644 --- a/package.json +++ b/package.json @@ -55,12 +55,12 @@ "grunt-jekyll": "~0.4.2", "grunt-jscs": "~1.2.0", "grunt-sass": "~0.17.0", - "grunt-saucelabs": "~8.4.1", + "grunt-saucelabs": "~8.5.0", "grunt-scss-lint": "^0.3.4", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~2.0.0", + "markdown-it": "^3.0.4", "npm-shrinkwrap": "^200.0.0", - "remarkable": "~1.6.0", "time-grunt": "~1.0.0" }, "engines": { |