Merge branch 'MDL-55841-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 15:24:33 +0000 (15:24 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 15:24:33 +0000 (15:24 +0000)
commit56f763b1f92607043916e19d6da51de8e0b0e8dc
tree8f2f0f58312616659988823ff91fb8e2e918e2fe
parentab64cd40b0da0ebec7c2e62935c8b58a6d047b27
parent3a5e14a5d064bd58b55d37e6d090e23ec2d0dc1c
Merge branch 'MDL-55841-master' of https://github.com/xow/moodle
enrol/lti/lang/en/enrol_lti.php
mod/lti/lang/en/lti.php