Merge branch 'MDL-60828-master' of git://github.com/sarjona/moodle
commit3452ea42655788e68065eebb8a7295846cd7c3e7
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Mar 2018 06:18:59 +0000 (13 14:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Mar 2018 06:18:59 +0000 (13 14:18 +0800)
tree96178ad5eb48cef2fbecc35819f7d9ac959aa59a
parentfe294b00ac6188f9d2bea6d41c607209da591964
parentbb4a79234b9deae5b0446b560b1d986a3c21fe7f
Merge branch 'MDL-60828-master' of git://github.com/sarjona/moodle
user/index.php