mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
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
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user