Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 12:24:58 +0000 (13:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 12:24:58 +0000 (13:24 +0100)
1  2 
admin/tool/mobile/classes/api.php

Simple merge