| commit | 6a4caa0128cafdf65bd684a0b1615059332461cf | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 3 Mar 2015 11:40:17 +0000 (3 11:40 +0000) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 3 Mar 2015 11:40:17 +0000 (3 11:40 +0000) | ||
| tree | 7cbc5332cd90440f642d69793d6dc774f7ebb575 | treesnapshot (tar.gz zip) |
| parent | 6d46e3a4f7f5c0f26ee4687ee39769f682581ff7 | commitdiff |
| parent | 60742fdad1d351fe761566bdc177fb062b072c34 | commitdiff |
Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle
Conflicts:
mod/lesson/version.php
mod/lesson/db/upgrade.php
mod/lesson/db/install.xml
Conflicts:
mod/lesson/version.php
mod/lesson/db/upgrade.php
mod/lesson/db/install.xml
| mod/lesson/db/install.xml | diff1 | diff2 | blobhistory |
| mod/lesson/db/upgrade.php | diff1 | diff2 | blobhistory |
| mod/lesson/version.php | diff1 | diff2 | blobhistory |