Merge branch 'MDL-63632-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 00:38:57 +0000 (02:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 00:38:57 +0000 (02:38 +0200)
commit4658eefa13a7c4a0acb9863e7cd8657e740bed8f
tree00f8c70029fd9adc96630643d67bca8f3ce7e142
parent0f943d26bfa3690206e10d78bc955803513ba5ee
parent7148f47f569bb6eafe10110e802fdf2d514eae7c
Merge branch 'MDL-63632-master' of git://github.com/andrewnicols/moodle