Merge branch 'MDL-53988-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:43:27 +0000 (11:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:43:27 +0000 (11:43 +0800)
commit367c85d78cc276e11811827310a95c93ab5fed2f
treef86be0d50e527198ffb3e79cf66815952efce4ce
parenta1643e66b0bac2080af5770fc30c8f4b67ea32ab
parent811d9ff94176b6d0765f5a0d86ec284ecee3e04f
Merge branch 'MDL-53988-master' of https://github.com/xow/moodle
mod/lti/lang/en/lti.php
mod/lti/locallib.php