Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle
commit3b89ce210d6496d3428261a10b37d6643cb49017
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 05:56:44 +0000 (25 06:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 05:56:44 +0000 (25 06:56 +0100)
treec85ae0380a4ba579283642ca82f8fd9b1f8e6a18
parent0579372b702a71b894be70b0ec2e845a6773ac1c
parentf2510387e5a1945b5faff66629ccfdf384013d0c
Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle
lang/en/admin.php
lib/outputrenderers.php