projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8225883 4267fc5)
Merge branch 'MDL-32727' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 18 May 2012 04:07:20 +0000 (16:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Fri, 18 May 2012 04:07:20 +0000 (16:07 +1200)
Conflicts:
mod/quiz/db/upgrade.php

1  2 
mod/quiz/db/upgrade.php patch | diff1 | diff2 | blob | history

diff --cc mod/quiz/db/upgrade.php
Simple merge
Moodle official production repository