Merge branch 'MDL-64570-master' of git://github.com/damyon/moodle
authorDavid Monllaó <davidm@moodle.com>
Tue, 19 Feb 2019 05:45:21 +0000 (06:45 +0100)
committerDavid Monllaó <davidm@moodle.com>
Tue, 19 Feb 2019 05:45:21 +0000 (06:45 +0100)
1  2 
lib/behat/form_field/behat_form_field.php
user/lib.php

diff --cc user/lib.php
Simple merge