| commit | 13a2aff3f99b3c7642841500bdf7a18d187949f4 | |
| author | David Monllao <davidm@moodle.com> | |
| Wed, 16 Sep 2015 01:57:22 +0000 (16 09:57 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Wed, 16 Sep 2015 01:57:22 +0000 (16 09:57 +0800) | ||
| tree | 5630f5db3925ca0c4199dd412f1c1e1e7b271373 | treesnapshot (tar.gz zip) |
| parent | b3ec8cf95e71970cc1702ea7b8f10974337c463d | commitdiff |
| parent | 6ae33efccb847e3307c47d5ee535abe7b1ddffa7 | commitdiff |
Merge branch 'MDL-49561_master' of git://github.com/markn86/moodle
Conflicts:
lib/bennu/readme_moodle.txt
Conflicts:
lib/bennu/readme_moodle.txt
| lib/bennu/readme_moodle.txt | diff1 | diff2 | blobhistory |