Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2014-05-20 08:52:54 +12:00
commit d57e3f8201
2 changed files with 6 additions and 1 deletions

View File

@ -773,3 +773,8 @@ img.iconsmall {
border: 2px solid @warningBorder;
}
}
#adminsettings .form-overridden {
color: @infoText;
background-color: @infoBackground;
}

File diff suppressed because one or more lines are too long