Merge branch 'wip-MDL-59876-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Nov 2017 03:59:16 +0000 (11:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 15 Nov 2017 09:35:30 +0000 (10:35 +0100)
1  2 
user/externallib.php

Simple merge