| commit | eee20b123b42906be2101d5b70027a103efea94e | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 2 Apr 2013 08:23:44 +0000 (2 16:23 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 2 Apr 2013 08:23:44 +0000 (2 16:23 +0800) | ||
| tree | e8c1af4ffe29e19df43ec9595408c931258a4fd6 | treesnapshot (tar.gz zip) |
| parent | cc067484a8629e942b068f2225e5b32b7d2ddf0c | commitdiff |
| parent | e2e9ff654211c27bcb6160b7e6e3c9a15b25d925 | commitdiff |
Merge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/db/upgrade.php
version.php
Conflicts:
lib/db/upgrade.php
version.php
| lib/db/install.xml | diff1 | diff2 | blobhistory |
| lib/db/upgrade.php | diff1 | diff2 | blobhistory |
| version.php | diff1 | diff2 | blobhistory |