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)
commit0c5eee372bd25c0a6b89ed28cbbb8bed5d1bbee6
treedb1859175d6ce08f5f9c77ab6ae1eb0892fae435
parent5fd24a89a65c3d5c6711d8e29be537cbf814fa0a
parente8eb8893265310b956d652fa70d3bc30078400e6
Merge branch 'MDL-57162-master' of git://github.com/jleyva/moodle
admin/tool/mobile/lang/en/tool_mobile.php
admin/tool/mobile/settings.php