| commit | c31081d0a46d4c8a89d61dc99a6f47d994e2f3ec | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Sun, 27 May 2012 23:19:06 +0000 (28 11:19 +1200) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Sun, 27 May 2012 23:19:06 +0000 (28 11:19 +1200) | ||
| tree | adf0f1bbf83b452a322127673a0dc972af4bdfe1 | treesnapshot (tar.gz zip) |
| parent | c994797ea9d6f03d535ebc50e2fbe2608661b371 | commitdiff |
| parent | 34b84d45b6abfdbbc325635bd88893b7d3052b8a | commitdiff |
Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle
Conflicts:
version.php
Conflicts:
version.php
| backup/moodle2/restore_stepslib.php | diff1 | diff2 | blobhistory |
| version.php | diff1 | diff2 | blobhistory |