Merge branch 'MDL-63870_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE
commit2baaed1860ddf12bf7389b494a9c762781f4f020
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 23:09:47 +0000 (23 00:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 23:09:47 +0000 (23 00:09 +0100)
tree76d6d8839320ad1e5deac4e7680d370cbfb90484
parentb56666b99c7f39d4d7893f32217aeba1d1c1a0f0
parent901c95587f28783162554d301a338520fad06b4c
Merge branch 'MDL-63870_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE