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)
1  2 
mod/chat/gui_header_js/jsupdate.php
mod/chat/gui_header_js/jsupdated.php

Simple merge
Simple merge