Merge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Oct 2017 01:38:47 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Oct 2017 01:38:47 +0000 (09:38 +0800)
1  2 
mod/lti/locallib.php

Simple merge