Merge branch 'MDL-61716-master' of git://github.com/mastnym/moodle
commitbaf8ff9cbfd8689af9c94a23961964d92d227299
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 15:39:15 +0000 (18 17:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 16:24:10 +0000 (18 18:24 +0200)
tree5aba25a8ddff1cdf30c9f97d9d20ebaacefaba83
parent37543ce51e624e8e4e533ee6c51eb1e4616803eb
Merge branch 'MDL-61716-master' of git://github.com/mastnym/moodle
admin/tool/oauth2/lang/en/tool_oauth2.php
lib/classes/oauth2/user_field_mapping.php