| commit | ef474575e107445185c9154c43731223e469b50a | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 16 Mar 2016 02:13:14 +0000 (16 10:13 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 16 Mar 2016 02:13:14 +0000 (16 10:13 +0800) | ||
| tree | 2b7752a84227ac19e7d8d93a60fbf42a19e5e800 | treesnapshot (tar.gz zip) |
| parent | 5162ffec0d931d7b48e591f90d3c34d819dc8199 | commitdiff |
| parent | 87a3e501923de52336566de2a4b36a06b748747a | commitdiff |
Merge branch 'MDL-51374-master-new' of git://github.com/lameze/moodle
Conflicts:
lib/db/caches.php
Conflicts:
lib/db/caches.php
| lang/en/cache.php | diff1 | diff2 | blobhistory |
| lib/db/caches.php | diff1 | diff2 | blobhistory |