Merge branch 'MDL-62188-master' of git://github.com/sarjona/moodle
commitaad67f481a372ef02bf1caf1d357739e3d577d4b
authorJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 06:50:04 +0000 (26 14:50 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 06:50:04 +0000 (26 14:50 +0800)
tree5c56b7173119fea919998b1d3a83228fe4942372
parent6ef65b8a85564ec260ddc0ebc17bf87cb74e57e3
parent697bed6bb7f93e59cb8364b93bb8066427a9574c
Merge branch 'MDL-62188-master' of git://github.com/sarjona/moodle