Merge branch 'master' into carousel_indicators_ie

Conflicts: dist/css/bootstrap.min.css
2013-10-20 17:45:07 -07:00 · 2013-10-20 17:45:07 -07:00 · bc76be5dcf
parent 5e70642dd2 f45c05a97a
commit bc76be5dcf
3 changed files with 1 additions and 3 deletions
--- 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: "";