Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 18:00:36 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 18:00:36 +0000 (20:00 +0200)
1  2 
admin/tool/templatelibrary/amd/src/display.js