2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into pr/13736

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-06-08 13:57:44 -07:00
56 changed files with 535 additions and 345 deletions
+1 -1
View File
@@ -208,7 +208,7 @@
.panel-heading {
border-bottom: 0;
+ .panel-collapse .panel-body {
+ .panel-collapse > .panel-body {
border-top: 1px solid @panel-inner-border;
}
}