projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fad0f24 6911fa1)
MDL-22414 Merge branch 'master' into backup-convert
authorDavid Mudrak <david@moodle.com>
Thu, 9 Jun 2011 11:04:49 +0000 (13:04 +0200)
committerDavid Mudrak <david@moodle.com>
Thu, 9 Jun 2011 11:04:49 +0000 (13:04 +0200)
Conflicts:
theme/base/style/core.css

1  2 
theme/base/style/core.css patch | diff1 | diff2 | blob | history

diff --cc theme/base/style/core.css
Simple merge
Moodle official production repository