Merge branch 'MDL-58544-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 07:36:40 +0000 (08:36 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 07:36:40 +0000 (08:36 +0100)
commit04d1f7764413f92f42c7093fd09b2585c597c99c
tree9a2e07611c0ca62dde8fe915f66f1e1ad0832662
parent2ae3581d6305a92d53c1ceac861018f0ea3941b0
parent859e2033cb4d520944ac24b2949b93e1fa64b160
Merge branch 'MDL-58544-master' of git://github.com/damyon/moodle
admin/tool/oauth2/lang/en/tool_oauth2.php
auth/oauth2/classes/auth.php
lib/db/upgrade.php
version.php