| commit | 90eb4ddd9a2285ebc60194c687f107200ad3e3d3 | |
| author | Marina Glancy <marina@moodle.com> | |
| Wed, 23 Oct 2013 06:22:28 +0000 (23 17:22 +1100) | ||
| committer | Marina Glancy <marina@moodle.com> | |
| Wed, 23 Oct 2013 06:22:28 +0000 (23 17:22 +1100) | ||
| tree | 22a0f4e273ec15d33d189e6c9cd159ebf7472206 | treesnapshot (tar.gz zip) |
| parent | 19becd541aa84435bd06d6266281a65b908847ff | commitdiff |
| parent | 3b681e6cf805bdd9639634f4555d7c47b5a0caad | commitdiff |
Merge branch '42246-26' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |