Merge branch 'MDL-62670-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 5 Jul 2018 01:25:41 +0000 (09:25 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 5 Jul 2018 01:25:41 +0000 (09:25 +0800)
commit523662f1411f89e8d19f285d4e772af174cbc9fd
treeb86cb3da48e737cc4be116442d2fdd5933cfde01
parentf84e9c4ead21de40d445dfded974802f524cf1a1
parent8502f02ae093b5f1c2efecd368c3e193b8b5c5b0
Merge branch 'MDL-62670-master' of git://github.com/sarjona/moodle
admin/tool/policy/lang/en/tool_policy.php
admin/tool/policy/lib.php