Merge branch 'MDL-59821-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 06:54:33 +0000 (14:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 06:54:33 +0000 (14:54 +0800)
1  2 
user/index.php

diff --cc user/index.php
Simple merge