Merge branch 'MDL-45380-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2014-05-20 08:53:04 +12:00
2 changed files with 7 additions and 1 deletions
@@ -739,3 +739,9 @@ img.iconsmall {
.alert;
.alert-danger;
}
#adminsettings .form-overridden {
color: @infoText;
background-color: @infoBackground;
}
File diff suppressed because one or more lines are too long