Merge branch 'MDL-55777-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 13:46:10 +0000 (13:46 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 13:46:10 +0000 (13:46 +0000)
commitd5d6eda93c96ac71686ddba5b66f1578e1f6232c
tree8d34585f478012c36ceee0b3eefc651b1e2343f1
parent158ab03e12dc3e451f77a27651a65f5647799dbc
parentf2330472f0963985deb34ca72ee2b33a6d4358b7
Merge branch 'MDL-55777-master' of git://github.com/ankitagarwal/moodle
lang/en/admin.php
version.php