| commit | 7e911af2208cee1d62379bc1c4bff23bb688c3ec | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 23 Dec 2014 01:04:12 +0000 (23 02:04 +0100) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 23 Dec 2014 01:04:12 +0000 (23 02:04 +0100) | ||
| tree | cf0fb9d927f936a8d8064c2cc7de624f83659e60 | treesnapshot (tar.gz zip) |
| parent | d25a7f21a30999edcb2386a7baca3a7f797a4eca | commitdiff |
| parent | 664d834cd11e1f88b67a3e71fa7465fffae8a5ab | commitdiff |
Merge branch '45699-28' of git://github.com/samhemelryk/moodle into MOODLE_28_STABLE
Conflicts:
cache/upgrade.txt
Conflicts:
cache/upgrade.txt
| cache/tests/cache_test.php | diff1 | diff2 | blobhistory |
| cache/tests/fixtures/lib.php | diff1 | diff2 | blobhistory |
| cache/upgrade.txt | diff1 | diff2 | blobhistory |