Merge branch 'MDL-59485' of https://github.com/IMSGlobal/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:11:09 +0000 (11:11 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:11:09 +0000 (11:11 +0200)
1  2 
mod/lti/locallib.php

Simple merge