Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2013-05-01 10:04:50 +08:00
parent bee592add8 acf49f4b9a
commit a6b274b232
9 changed files with 323 additions and 10 deletions
@@ -722,7 +722,8 @@ img.iconsmall {
 }

 #core-cache-rescan-definitions,
-#core-cache-mode-mappings .edit-link {
+#core-cache-mode-mappings .edit-link,
+#core-cache-lock-summary .new-instance {
    margin-top: 0.5em;
    text-align: center;
 }