Merge branch 'MDL-61826-master' of git://github.com/junpataleta/moodle
commit054900f5ed0c230a4e4488c995915e219966526d
authorJun Pataleta <jun@moodle.com>
Wed, 6 Jun 2018 08:58:22 +0000 (6 16:58 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:38 +0000 (6 11:16 +0200)
treeeec33083e57f991e0a01177c2d4b5f37949d8562
parent959d5fadc6d533ddfe9622aebc3873f1e6de908e
parent7766dbed5d9d0ce01210e1b5c5b9890494139c8c
Merge branch 'MDL-61826-master' of git://github.com/junpataleta/moodle