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)
1  2 
enrol/lti/lang/en/enrol_lti.php
mod/lti/lang/en/lti.php

Simple merge
Simple merge