Merge branch 'MDL-61668-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:31:18 +0000 (00:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:31:18 +0000 (00:31 +0200)
1  2 
admin/tool/mobile/classes/api.php

Simple merge