Merge branch 'MDL-61600-master' of git://github.com/dpalou/moodle
commita2fc9a47725225969198820efa259426456791f1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2018 13:43:25 +0000 (14 14:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2018 13:43:25 +0000 (14 14:43 +0100)
tree3a8e9f0fa3d022e1d4a4c349426135e69b21a4ca
parent30d1b7d1a775937f3ad779b561a4a0e420249e0f
parentf72ca3ce29c1445669ddd0b9d7957646db602eb5
Merge branch 'MDL-61600-master' of git://github.com/dpalou/moodle