| commit | d30255a08d5482c2bac9da84df8db16ee7cdcc12 | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 7 Oct 2015 04:48:03 +0000 (7 12:48 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 7 Oct 2015 04:48:03 +0000 (7 12:48 +0800) | ||
| tree | 7c832b20a2b2866cd60f20eeef0a9302cbe9b016 | treesnapshot (tar.gz zip) |
| parent | de27cf6a3fb17e1bd0c5a2f18e20c4cc0fffa347 | commitdiff |
| parent | 13bb68199e64b3d5d8aa4a68d69b061c4de953e2 | commitdiff |
Merge branch 'MDL-51579-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Conflicts:
version.php
| course/externallib.php | diff1 | diff2 | blobhistory |
| lib/db/services.php | diff1 | diff2 | blobhistory |