| commit | 68c3db8f5f18f2a1bfb43e62ad5640a21836060b | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 7 Oct 2015 06:14:21 +0000 (7 14:14 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 7 Oct 2015 06:14:21 +0000 (7 14:14 +0800) | ||
| tree | 205f9764275ccd8fb3d543575e6b182a03770ce5 | treesnapshot (tar.gz zip) |
| parent | ff93a2a6f3b662a86b78f5acb8b644f701174551 | commitdiff |
| parent | f77cd37160003d6073a991f835ca2befdbedb964 | commitdiff |
Merge branch 'MDL-51537-master' of git://github.com/lameze/moodle
Conflicts:
lib/upgrade.txt
Conflicts:
lib/upgrade.txt
| lib/thirdpartylibs.xml | diff1 | diff2 | blobhistory |
| lib/upgrade.txt | diff1 | diff2 | blobhistory |