Merge branch 'MDL-60005-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 22:54:09 +0000 (00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 22:54:09 +0000 (00:54 +0200)
1  2 
admin/tool/mobile/classes/api.php

Simple merge