Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Nov 2017 00:47:17 +0000 (08:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Nov 2017 00:47:17 +0000 (08:47 +0800)
commit58280ae0b846b2b65784e77dd0d10efba8d81186
treecce2831fe7aa9d718af74f3a809c85e115916c9d
parentc8e777776621b76f9b99ca40fe85ecade2afd33c
parentab2095fb0f05a5b50c195c7c38014e0e6698bc33
Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle
theme/bootstrapbase/style/moodle.css
user/index.php