Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 10:44:52 +0000 (12:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 10:44:52 +0000 (12:44 +0200)
commiteb3b4893b535567641afabee80649c2bf052f374
treea085a631dc03fc0d3a18b91e2f21aa821ef6ba70
parent5920c233feb2e7a0c445926abf5671709eb58e48
parente1ca4da750af94f01f4b4d89bb05f2e33a80b380
Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle
mod/chat/gui_header_js/jsupdate.php
mod/chat/gui_header_js/jsupdated.php