diff options
| author | Mark Otto <[email protected]> | 2014-03-03 21:52:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-03 21:52:56 -0800 |
| commit | af39290a9de8b156bacfdc93d209a683f611714c (patch) | |
| tree | 60d47dc4956e06bbfd4766b9ac67dbbb35d47dab /package.json | |
| parent | 2ece8dd33616bc2e7f753d108810df7eeac7c3a9 (diff) | |
| parent | d1c971a1341050ef588b5a93ebfb297db1564496 (diff) | |
| download | bootstrap-af39290a9de8b156bacfdc93d209a683f611714c.tar.xz bootstrap-af39290a9de8b156bacfdc93d209a683f611714c.zip | |
Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
Conflicts:
Gruntfile.js
package.json
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index 9610cc1d4..6b1673b85 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "devDependencies": { "btoa": "~1.1.1", "canonical-json": "~0.0.4", + "css-flip": "~0.3.0", "grunt": "~0.4.2", "grunt-banner": "~0.2.1", "grunt-contrib-clean": "~0.5.0", |