Merge branch 'master' of https://github.com/yuriy-os/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2016 18:00:00 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2016 18:11:27 +0000 (20:11 +0200)
1  2 
lib/javascript-static.js

Simple merge