Merge branch 'MDL-53985-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jan 2018 04:39:19 +0000 (12:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jan 2018 04:39:19 +0000 (12:39 +0800)
1  2 
mod/assign/locallib.php

Simple merge