diff options
| author | Mark Otto <[email protected]> | 2013-07-21 08:52:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-21 08:52:25 -0700 |
| commit | 12468c61037469985e0cc1669966d63208becc75 (patch) | |
| tree | b286e5447c8195e91eee96caa007295c088f4988 /dist/css/bootstrap.css | |
| parent | a63db4d2f91c056310fc9a24891dbd161672451b (diff) | |
| parent | 582e9986a865dbf7e0bf1aca2dbec19cb3218506 (diff) | |
| download | bootstrap-12468c61037469985e0cc1669966d63208becc75.tar.xz bootstrap-12468c61037469985e0cc1669966d63208becc75.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6946ab2ec..f9c03e309 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3284,7 +3284,6 @@ button.close { } .breadcrumb > li + li:before { - display: inline-block; padding: 0 5px; color: #cccccc; content: "/\00a0"; |