Permalink
Browse files

Merge branch 'wip-MDL-40087_M25' of git://github.com/gjb2048/moodle i…

…nto MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
danpoltawski committed Jun 11, 2013
2 parents 43c5a7d + 9bc4a4c commit bacf4c5c713e69bbe8c7c844859dc75eddb0f8f5
Showing with 2 additions and 2 deletions.
  1. +1 −1 theme/bootstrapbase/less/moodle/modules.less
  2. +1 −1 theme/bootstrapbase/style/moodle.css
@@ -76,7 +76,7 @@ select {
.breadcrumb-button {
float: right;
- margin-top: 3px;
+ margin-top: 4px;
}
.dir-rtl .navbar .brand {
float: right;

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit bacf4c5

Please sign in to comment.