Merge branch 'MDL-56019-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 18:08:31 +0000 (20:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 18:08:31 +0000 (20:08 +0200)
commitb3823c4365059de75fde5cd2913b55e65d3c169d
treee311790602ae809a2a90ad13fe5b4deba1a8664a
parent1138bbc69eac84cdf6399eae08a0fd6c489b9c12
parentd33c67bc4744f901bf389607cfbbb683ef1c7d80
Merge branch 'MDL-56019-master' of git://github.com/dpalou/moodle
mod/forum/externallib.php
mod/wiki/classes/external.php