Merge branch 'master' into carousel_indicators_ie

Conflicts: dist/css/bootstrap.min.css

Merge branch 'master' into carousel_indicators_ie
Conflicts: dist/css/bootstrap.min.css
bc76be5d · Mark Otto · 5e70642d · f45c05a9 · bc76be5d · bc76be5d
Commit bc76be5d authored Oct 20, 2013 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

dist/css/bootstrap.css dist/css/bootstrap.css +0 -1

dist/css/bootstrap.min.css dist/css/bootstrap.min.css +1 -1

less/print.less less/print.less +0 -1

No files found.
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -232,7 +232,6 @@ table {
  abbr[title]:after {
    content: " (" attr(title) ")";
  }
-  .ir a:after,
  a[href^="javascript:"]:after,
  a[href^="#"]:after {
    content: "";

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/print.less
+++ b/less/print.less
@@ -26,7 +26,6 @@
  }
  // Don't show links for images, or javascript/internal links
-  .ir a:after,
  a[href^="javascript:"]:after,
  a[href^="#"]:after {
    content: "";