Merge branch 'MDL-64032-master' of https://github.com/HuongNV13/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Aug 2019 04:55:35 +0000 (12:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Aug 2019 04:55:35 +0000 (12:55 +0800)
1  2 
lib/enrollib.php
user/amd/build/status_field.min.js
user/amd/build/status_field.min.js.map

Simple merge
index b2f3ab5,5588775..faeb294
Binary files differ
index 1ad4665,0000000..e0fe66a
mode 100644,000000..100644
Binary files differ