| commit | f049403ed14503728cb6c51a74af6078c0fecd07 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 13 Jan 2015 12:54:53 +0000 (13 12:54 +0000) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 13 Jan 2015 12:54:53 +0000 (13 12:54 +0000) | ||
| tree | 4a3bf4c556bb5a2538eebf4cbf8e12e7fd84ca93 | treesnapshot (tar.gz zip) |
| parent | 7e6be7ba1fdeb27fcaad85aa57cbb5c8f1354382 | commitdiff |
| parent | 502a403b430ecf79c3d2908fd6c338f7ca4d8a30 | commitdiff |
Merge branch 'MDL-39103-28' of git://github.com/xow/moodle into MOODLE_28_STABLE
Conflicts:
mod/lesson/lib.php
Conflicts:
mod/lesson/lib.php
| mod/lesson/lib.php | diff1 | diff2 | blobhistory |
| mod/lesson/report.php | diff1 | diff2 | blobhistory |
| mod/lesson/view.php | diff1 | diff2 | blobhistory |