]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
authorMark Otto <otto@github.com>
Tue, 4 Mar 2014 05:52:56 +0000 (21:52 -0800)
committerMark Otto <otto@github.com>
Tue, 4 Mar 2014 05:52:56 +0000 (21:52 -0800)
commitaf39290a9de8b156bacfdc93d209a683f611714c
tree60d47dc4956e06bbfd4766b9ac67dbbb35d47dab
parent2ece8dd33616bc2e7f753d108810df7eeac7c3a9
parentd1c971a1341050ef588b5a93ebfb297db1564496
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
Gruntfile.js
package.json