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)
commite822312af30f1aa5ec7fa11dec9d39cc12133ead
tree05b6799f305d3df5192a7dc60e6db745d5cb9d59
parent6a359c20fb21b98d899dee78872ac5f428b78da3
parent7f70d548fe993e289eb1d0bd5f123d7356ac8765
Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle
admin/tool/templatelibrary/amd/src/display.js