Skip to content

Commit

Permalink
Merge branch 'wip-MDL-40087_M25' of git://github.com/gjb2048/moodle i…
Browse files Browse the repository at this point in the history
…nto MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
danpoltawski committed Jun 11, 2013
2 parents 43c5a7d + 9bc4a4c commit bacf4c5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion theme/bootstrapbase/less/moodle/modules.less
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ select {

.breadcrumb-button {
float: right;
margin-top: 3px;
margin-top: 4px;
}
.dir-rtl .navbar .brand {
float: right;
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit bacf4c5

Please sign in to comment.