| commit | c2e15c4619d3fd8475dc20c25eb923c9b071ae81 | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Mon, 28 Jan 2013 04:28:54 +0000 (28 17:28 +1300) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Mon, 28 Jan 2013 04:28:54 +0000 (28 17:28 +1300) | ||
| tree | 2709d00fba0884ed534c190f80a48d54103e4236 | treesnapshot (tar.gz zip) |
| parent | d6fdc727ea7b4568c135f034a04a9dec1648136b | commitdiff |
| parent | 0acd3748324875fbe08a18bd15ea5d888f8aff52 | commitdiff |
Merge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Conflicts:
question/format/learnwise/format.php
Conflicts:
question/format/learnwise/format.php
| lang/en/question.php | diff1 | diff2 | blobhistory |
| question/format/learnwise/format.php | diff1 | diff2 | blobhistory |