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)
1  2 
admin/tool/policy/lang/en/tool_policy.php
admin/tool/policy/lib.php

Simple merge