Merge branch 'MDL-41321_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski
2013-08-27 14:08:14 +08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -91,7 +91,7 @@
font-weight: bold;
}
.groupinfobox {
border: 1px solid;
.well
}
.groupinfobox .left {
padding: 10px;
File diff suppressed because one or more lines are too long