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)
commite3a2d7a473c02f4fead494d7500c82ee9f17fdfd
tree1d2f2a154fc72483f13b4746d38435c812b31091
parentb8cf4be7a7b21a72829cdae6f4edb7f05fa0426b
parent9651e491d8ab374e1b8f985ab36d9f73d5d61103
Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle
lang/en/moodle.php
user/index.php