Merge branch 'MDL-46513_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 6 Jun 2018 07:59:21 +0000 (15:59 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:34 +0000 (11:16 +0200)
commit959d5fadc6d533ddfe9622aebc3873f1e6de908e
treee060b3e76ed5852224c3465c2c4a5e7425be4cbc
parent43cc39bbc2a4a5c6052380a75663b481f6c7a737
parent88e16674b23065f6ed220bad583e281cf340e0c6
Merge branch 'MDL-46513_master' of git://github.com/markn86/moodle