Merge branch 'MDL-61892-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 Apr 2018 03:47:54 +0000 (11:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 Apr 2018 03:47:54 +0000 (11:47 +0800)
commit9fe8d2e33512d9d42d53cd5762753d14dc1aa48e
tree1061992afffed59ac8854278733b88f3e7d7abf7
parentb17dd2a3d638c69a599de27a10a62b73b63b2832
parentde33cd0cabd84eaa5a9b4c456b70473ff3836d88
Merge branch 'MDL-61892-master' of git://github.com/zig-moodle/moodle
admin/tool/oauth2/lang/en/tool_oauth2.php