Merge branch 'MDL-57394-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 30 Jan 2018 16:57:59 +0000 (17:57 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:17 +0000 (10:33 +0800)
commite57392fabee4550ab340e1ab080acc96811f2094
treee090c0d0cfa3aa6f519e92bf6f686bd98a3ae8f0
parentcdef2e7d345084f03a7f92ffd782b7750fba484b
parentbf7a643f8af5a5c0b30aab619edf356d8b7debfa
Merge branch 'MDL-57394-master' of git://github.com/jleyva/moodle