Merge branch 'MDL-61437-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Feb 2018 01:24:57 +0000 (02:24 +0100)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:57 +0000 (08:30 +0800)
commit0f8c06e0f51533723e4e090c64c94532e189b5e6
treeeb1e67288168626794f04877a8e8eea19188429b
parent59462743e667143c89221ee4fe22f6e9d59a2b0f
parent728e195c5e2eb4f269d06b1cfa881e668a6e542d
Merge branch 'MDL-61437-master' of git://github.com/lameze/moodle