| commit | f49cd5fcd8551595cd79b60f763d0fb2f53bd711 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 17 Jun 2013 22:48:50 +0000 (18 00:48 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 17 Jun 2013 22:48:50 +0000 (18 00:48 +0200) | ||
| tree | 0de0001924039f6a3007224dac3280f0fd166706 | treesnapshot (tar.gz zip) |
| parent | 62c4ccef0e025a71d497341de0af9448bd51aa43 | commitdiff |
| parent | 8feae80284360d02641a3a398ecaaabff390a25e | commitdiff |
Merge branch 'MDL-33562-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Conflicts:
version.php
Conflicts:
version.php
| lib/db/upgrade.php | diff1 | diff2 | blobhistory |
| lib/moodlelib.php | diff1 | diff2 | blobhistory |
| version.php | diff1 | diff2 | blobhistory |