Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:58:16 +0000 (11:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:58:16 +0000 (11:58 +0800)
commit9dfee70f6b5a9ac7574e07dcfe40d40ec350c3b3
tree93aae5da1ca7b58ec4cf20bf0349e264b0aafec7
parent9e550d5804fd5ef26351abd1540c88b002ef3f08
parentb1c8a860cbb51f8d6b3115d9f16190692c56a8fb
Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle
mod/lti/lang/en/lti.php
mod/lti/locallib.php