Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jun 2016 17:12:02 +0000 (19:12 +0200)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:58 +0000 (09:24 +0100)
commit47d986828e4c83c97c4fb6bbddd2f3b8957aa828
tree7e94ada11ea5c76012ba93a6c8fa03b9213300b2
parent4a365babb65cdd07bcf8d028392d2e339f3f407f
parentccc9777aeee6890f3d99bf44472e6969c0db63de
Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle
mod/lti/lang/en/lti.php