Merge branch 'wip-MDL-29332-master-3' of git://github.com/marinaglancy/moodle
commitcecba1d92e0324d0bce08bd9f6987e504d388b5a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2016 09:51:08 +0000 (19 11:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2016 09:51:08 +0000 (19 11:51 +0200)
treec12051a4626ba5d78869bb59c3569a1ae6f28560
parenta878a09bced6fb34c32de045ba5d13cc9b8a204d
parente7ba25f1b13f1e5510e17d726b3c9f1f81cc27a6
Merge branch 'wip-MDL-29332-master-3' of git://github.com/marinaglancy/moodle
lib/db/upgrade.php
lib/upgrade.txt
version.php