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

Simple merge