Merge branch 'master_MDL-60253' of https://github.com/CengageEng/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 20 Nov 2017 00:21:30 +0000 (13:21 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 20 Nov 2017 00:21:30 +0000 (13:21 +1300)
1  2 
mod/lti/locallib.php

Simple merge