aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-20 17:45:07 -0700
committerMark Otto <[email protected]>2013-10-20 17:45:07 -0700
commitbc76be5dcf0b872a736e0dbf2f2f373ca928234e (patch)
tree0309596dcd3029a4a8b424f86fbfa9e2abb63440 /dist/css/bootstrap.css
parent5e70642dd2ea14f3cff6e245b3f60ee69c97c793 (diff)
parentf45c05a97a4dda6a657ff89fcbfa283308d0b329 (diff)
downloadbootstrap-bc76be5dcf0b872a736e0dbf2f2f373ca928234e.tar.xz
bootstrap-bc76be5dcf0b872a736e0dbf2f2f373ca928234e.zip
Merge branch 'master' into carousel_indicators_ie
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css1
1 files changed, 0 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index a6812e028..8ced2d7e0 100644
--- 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: "";