Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 09:15:11 +0000 (11:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 09:15:11 +0000 (11:15 +0200)
commit2205ecc2b675fcd5d92837ddcbfa2fde357ed706
treeb47fafcef5dd8fab90bbbdf09ac8544bd1c8e6db
parent78f6d5196dda7d349582a5e891be8e2365a8b11a
parent21b50ebe1968d8476cedeb011fd334e5fbd09091
Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle