Merge branch 'MDL-61859-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 20:27:25 +0000 (22:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 20:27:25 +0000 (22:27 +0200)
commit74e48d168fcb6ac7246a0187faa58daab4026d8d
tree4259508e393e36912f59a6c63df36cad9de8afea
parent0f0d0004bdad73925e7d0c5828a5598421d32b4c
parentfdae6f77d6c97cbedb798ad136b14cf87fe2d39b
Merge branch 'MDL-61859-master' of https://github.com/snake/moodle