Merge branch 'MDL-60365-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:23:38 +0000 (00:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:23:38 +0000 (00:23 +0200)
1  2 
admin/tool/mobile/classes/api.php

Simple merge