Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle
commit0b4e4ca48f3c975c64c280fa831c9e0113b62f89
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Mar 2018 06:36:31 +0000 (26 14:36 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:36 +0000 (28 18:12 +0200)
tree892d392c31631421e91e2021b614e60f51f45b0e
parentd5458014b3ec2a1da9cf8bbb85c3ce52e57a6791
parentefdf25636a88659bb2fec4f7dc23c6d83091551a
Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle