Merge branch 'MDL-62961_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 23:24:34 +0000 (01:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 23:24:34 +0000 (01:24 +0200)
commit193a3aa9d789b04052b0451e29d0c307a6a6cf6e
tree83556e0821e709f58b999c39806cc703a2c59827
parentcbbbdf27b16e23288548e29baa47c3d9950cd763
parent0089fc929ece18c9d892c23ce4db499abc3f85d8
Merge branch 'MDL-62961_master' of git://github.com/markn86/moodle