Merge branch 'MDL-61058-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 31 Jan 2018 20:04:08 +0000 (21:04 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:20 +0000 (10:33 +0800)
commit632293b09af99ce5dff5d2e59005de02fa86e10a
tree352732b57eea4a7918407a4f09d446c16fb8b1bb
parent025ef39f1432d040f7f439165b871da8712fc575
parent3a732ec7bb5c39ab1156ca9d58bc2ae9a438b766
Merge branch 'MDL-61058-master' of git://github.com/junpataleta/moodle