Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 07:54:22 +0000 (07:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 07:54:22 +0000 (07:54 +0000)
commit48f5c0501904e8eb7e0444c2e4381bfad9129971
tree4525ca89c89eb81d1ed8022b56b7e109e5be8e72
parent5d8d3a8ce22aa5526feb7f40528817ec4de54799
parent44e86fb3d54ab0d054f7babb3310853213469e50
Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle
lang/en/deprecated.txt
lib/adminlib.php
lib/formslib.php