Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 09:36:14 +0000 (10:36 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 09:36:14 +0000 (10:36 +0100)
1  2 
lang/en/moodle.php
user/index.php

Simple merge
diff --cc user/index.php
Simple merge