Merge branch 'MDL-59047-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 01:04:35 +0000 (03:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 01:04:35 +0000 (03:04 +0200)
commit01911b9f1f7f1e44302140ebf86547a9d05e67df
treed783d79fff00cbf1e8844744e1f1b0247ad2e114
parentcb6ba9b1be6bee61ec95454bccf4e1695bbe19a6
parent7605e3899fcd34532232d835899fd2b32b99ffe7
Merge branch 'MDL-59047-master' of git://github.com/bmbrands/moodle