Merge branch 'MDL-57569-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 27 Nov 2017 06:43:32 +0000 (19:43 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 27 Nov 2017 06:43:32 +0000 (19:43 +1300)
commit417d543aaa778a954c64ba15170bf2dc4a7930b9
tree8ef08546ec170acc7c27ed384fc07ac6e73f27f3
parent78a534dde0340e80fedb1fbaf5db1b08ae5119fd
parent6820f36bda326b08760c3c28b91687d2edf79d79
Merge branch 'MDL-57569-master' of git://github.com/sarjona/moodle