Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 13:41:13 +0000 (13:41 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 13:41:13 +0000 (13:41 +0000)
commitf5af2e6866074c27833909e3d6cbd859a3174b08
treec07cbbb6e490a50aedfd5369d721f6d234b32c0c
parentb747a90082ed774d1176db830eb361a34c13ae25
parent8380658219ed87f823f6abdd04fd7a1b8a4430ab
Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle
lib/db/upgrade.php
lib/templates/login.mustache
theme/boost/templates/core/login.mustache
version.php