Merge branch 'MDL-66500-master-unoconvwarning' of git://github.com/mudrd8mz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Sep 2019 04:14:00 +0000 (12:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Sep 2019 04:14:00 +0000 (12:14 +0800)
1  2 
lang/en/admin.php

Simple merge