Merge branch 'MDL-61152-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jan 2018 09:21:39 +0000 (10:21 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:16 +0000 (10:33 +0800)
commit54c51cc81051432665638dbbf0676b3bc7e6d7e4
tree1f26210077604457da25399d1f91e044c9c39a1c
parent237bc01fdfae06196d9d52ba4cbcec38520a1780
parent3894262a2f898ab356d81148e4aa7a1fd806fd12
Merge branch 'MDL-61152-master' of git://github.com/junpataleta/moodle