Merge branch 'MDL-57838-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 11:27:04 +0000 (11:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 11:27:04 +0000 (11:27 +0000)
1  2 
admin/tool/mobile/classes/api.php

Simple merge