| commit | 224d819678fea1495ad16bf3c494c132f4dee1a6 | |
| author | David Monllao <davidm@moodle.com> | |
| Tue, 15 Sep 2015 09:09:33 +0000 (15 17:09 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Tue, 15 Sep 2015 09:09:33 +0000 (15 17:09 +0800) | ||
| tree | 05d78ccd61d3c0233306dadc3b158f0ebcafa2bf | treesnapshot (tar.gz zip) |
| parent | 8a086682555e3308458f8f73731d56e829fbffe5 | commitdiff |
| parent | c0ef63eb383d4dc78b166708eaf10df59c2421e3 | commitdiff |
Merge branch 'MDL-50964-master' of git://github.com/jleyva/moodle
Conflicts:
group/tests/externallib_test.php
lib/db/services.php
Conflicts:
group/tests/externallib_test.php
lib/db/services.php
| group/externallib.php | diff1 | diff2 | blobhistory |
| group/tests/externallib_test.php | diff1 | diff2 | blobhistory |
| lib/db/services.php | diff1 | diff2 | blobhistory |