| commit | 45d011c896936e843e1f9f3f96b7df9b0f5f9e5f | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Wed, 20 Jun 2012 21:46:32 +0000 (21 09:46 +1200) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Wed, 20 Jun 2012 21:46:32 +0000 (21 09:46 +1200) | ||
| tree | 84d1c8d8e65cd3236889995871b2f5b3d9194103 | treesnapshot (tar.gz zip) |
| parent | c575842ce93cfdd0fc19e6832cb060b322fef224 | commitdiff |
| parent | 642b1ca32509de0226a617ff6af2f913ff8f89ba | commitdiff |
Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/base/style/core.css
Conflicts:
theme/base/style/core.css
| theme/base/style/core.css | diff1 | diff2 | blobhistory |
| theme/base/style/course.css | diff1 | diff2 | blobhistory |