| commit | 685aa0b7c9565939aa4d9933a6d5c66ebdccd40a | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 16 Sep 2015 01:59:04 +0000 (16 09:59 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 16 Sep 2015 01:59:04 +0000 (16 09:59 +0800) | ||
| tree | dad40818fff337a31f6f6e2980c271e1505d557a | treesnapshot (tar.gz zip) |
| parent | 57caaace449bf6e2799234ab80db373df9d16993 | commitdiff |
| parent | dbeeebc0f6383cf20aea44f7663d66dd9e1ebfd3 | commitdiff |
Merge branch 'MDL-49561_m28' of git://github.com/markn86/moodle into MOODLE_28_STABLE
Conflicts:
lib/bennu/readme_moodle.txt
Conflicts:
lib/bennu/readme_moodle.txt
| lib/bennu/readme_moodle.txt | diff1 | diff2 | blobhistory |