Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip

Browse Source

Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json

...

This commit is contained in:

Mark Otto

2014-03-03 21:52:56 -08:00

parent 2ece8dd336 d1c971a134

commit af39290a9d

11 changed files with 602 additions and 21630 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/dist/css/bootstrap-theme.rtl.min.css

Vendored

+7

File diff suppressed because one or more lines are too long

docs/dist/css/bootstrap.rtl.css

Vendored

-7170

File diff suppressed because it is too large Load Diff

docs/dist/css/bootstrap.rtl.min.css

Vendored

+1 -7162

File diff suppressed because one or more lines are too long