| commit | 8ef170b1cc737e18bdd99fe58ca8c8415a4630fb | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 13 Jan 2015 12:54:32 +0000 (13 12:54 +0000) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 13 Jan 2015 12:54:32 +0000 (13 12:54 +0000) | ||
| tree | 3d9fc81f6ffdd2a4ea153572fbb49d7fc46f0d42 | treesnapshot (tar.gz zip) |
| parent | 953601bcb03fda1fb49de268b3030c435312a20d | commitdiff |
| parent | 5ce6beca1559fc1aafd511c54247a4b567d05f9f | commitdiff |
Merge branch 'MDL-39103-27' of git://github.com/xow/moodle into MOODLE_27_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 |