aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-10-29 09:45:09 -0700
committerMark Otto <[email protected]>2014-10-29 09:45:09 -0700
commit34c2f46c8b819eb765224ac4f161071489a53ccb (patch)
treefd65a3e131db2f3c746239f4e321f571f69f4c32 /package.json
parent22f9c8fc0ac2d4c1f7da4b920b8a8a714bed80c4 (diff)
parent22baa8153b58e80df248b38ddf2aeae4f3f9cc2b (diff)
downloadbootstrap-34c2f46c8b819eb765224ac4f161071489a53ccb.tar.xz
bootstrap-34c2f46c8b819eb765224ac4f161071489a53ccb.zip
Merge branch 'master' into v3.3.0
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index fe6cbc0af..59f823533 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~1.0.0",
"npm-shrinkwrap": "~4.0.0",
- "remarkable": "^1.2.0",
+ "remarkable": "^1.2.2",
"time-grunt": "~1.0.0"
},
"engines": {