Merge branch 'mdl58817-master' of https://github.com/tlock/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Nov 2017 06:03:50 +0000 (19:03 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:30 +0000 (13:24 +0100)
1  2 
mod/lti/locallib.php

Simple merge