Merge branch 'MDL-62472-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 May 2018 16:29:46 +0000 (18:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 May 2018 16:29:46 +0000 (18:29 +0200)
commit57cc5dc750438f6056145685c79bf4322936201a
tree17e5ffefe6d559166915ed7544337d396dce8abb
parent897a492729725c00ede17d85384c258da53d417d
parenta6c45af354f2b6723dbd89e8109c42fc56718b6f
Merge branch 'MDL-62472-master' of git://github.com/bmbrands/moodle