Merge branch 'master' of https://github.com/koennys/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 03:48:50 +0000 (11:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 03:48:50 +0000 (11:48 +0800)
commit930cab683d5bc5f9dab6f835bcb71fa464329248
treed40bd94219fac407cfac198fbfcec144d6f53001
parenta9bca28400da360d68a4f622e93988c610203cfe
parentbb9f8451b7c734c80404dda8e5432132438e80b7
Merge branch 'master' of https://github.com/koennys/moodle
auth/db/lang/en/auth_db.php
auth/db/settings.php