Merge branch 'MDL-46344-master' of https://github.com/lucaboesch/moodle
commit01dc21198f9f5c2e9771db46de8e37f680dadb37
authorDavid Monllao <davidm@moodle.com>
Tue, 5 Jun 2018 10:17:19 +0000 (5 12:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:16 +0000 (6 11:16 +0200)
tree5386fcd0dde8d3134c2420d7c29f123e53ec375d
parent75ebfbdf9929b231d99c60ecd9871161a36989a8
parentd8343b5432445c9bb77e961d118cac574df0da7e
Merge branch 'MDL-46344-master' of https://github.com/lucaboesch/moodle