Merge branch 'MDL-57162-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 11:38:06 +0000 (11:38 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 11:38:06 +0000 (11:38 +0000)
1  2 
admin/tool/mobile/lang/en/tool_mobile.php
admin/tool/mobile/settings.php

Simple merge