| commit | a647e1f053a2648f3b50140c18fe6e1a8f0c8802 | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 1 Apr 2015 03:49:31 +0000 (1 11:49 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 1 Apr 2015 03:49:31 +0000 (1 11:49 +0800) | ||
| tree | bb29909b965a8d45a24b3151292ad5ac79fdcf47 | treesnapshot (tar.gz zip) |
| parent | 0005ce8e4b65d2215479c84fc7a1f9a398494786 | commitdiff |
| parent | ebfa74c7990d039f1f615f57c5bbb568f277eea5 | commitdiff |
Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
Conflicts:
lib/db/services.php
| lib/db/services.php | diff1 | diff2 | blobhistory |