| commit | b3434ca51d5a584519328ba23670bd9b44ebda0d | |
| author | David Monllao <davidm@moodle.com> | |
| Tue, 15 Sep 2015 09:56:20 +0000 (15 17:56 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Tue, 15 Sep 2015 09:56:20 +0000 (15 17:56 +0800) | ||
| tree | f41b94f1253ca407c08f44849725c8c8d0c1daa2 | treesnapshot (tar.gz zip) |
| parent | 3bc0824e46f56b6b5bfeee0ae525a7aeb3058a1b | commitdiff |
| parent | 20dbcc33e8bcf93513f6f9d070aec915dc982c82 | commitdiff |
Merge branch 'MDL-33564-master' of git://github.com/danpoltawski/moodle
Conflicts:
lib/upgrade.txt
Conflicts:
lib/upgrade.txt
| lib/upgrade.txt | diff1 | diff2 | blobhistory |