diff options
| author | Mark Otto <[email protected]> | 2013-02-14 23:42:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-14 23:42:47 -0800 |
| commit | ae525258af17ef8f14259971442eacbec31d1d01 (patch) | |
| tree | 5f5958f83b59356cdac32440183b691afe0c4e7a /package.json | |
| parent | b1e7010bfcba029180545fe0dcf4d66183ea4a71 (diff) | |
| parent | aa5f09037133f22093c4b97d15451d4e54180ba2 (diff) | |
| download | bootstrap-ae525258af17ef8f14259971442eacbec31d1d01.tar.xz bootstrap-ae525258af17ef8f14259971442eacbec31d1d01.zip | |
Merge branch 'bs3_jekyll' into 3.0.0-wip
Conflicts:
docs/css.html
docs/templates/pages/css.mustache
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/package.json b/package.json index 2941c2963..84fc2166e 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,5 @@ , "jshint": "0.9.1" , "recess": "1.1.6" , "connect": "2.1.3" - , "hogan.js": "2.0.0" } } |