Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Apr 2017 02:29:50 +0000 (10:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Apr 2017 02:29:50 +0000 (10:29 +0800)
1  2 
mod/choice/lib.php
mod/lesson/lib.php
mod/quiz/lib.php

Simple merge
Simple merge
Simple merge