Merge branch 'MDL-60445-master' of https://github.com/lucaboesch/moodle
commit3e5d0447fdf2b6619d1587455b1e687ec306fbc2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2018 18:19:21 +0000 (7 19:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2018 18:19:21 +0000 (7 19:19 +0100)
tree775274485c72c42946299abe5b73fa5436ae8287
parentabe7ceabfa615602715d973db32104c38920c7b7
parentc91a59ac4220c17673ca68280901f60926cbfc12
Merge branch 'MDL-60445-master' of https://github.com/lucaboesch/moodle