Merge branch 'MDL-60959-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 00:14:39 +0000 (01:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 00:14:39 +0000 (01:14 +0100)
commit3e9282d486e00dd43b5ad41b3d87c611e8307fbf
tree9c430732c58fdbd8dd71edb255dbbd1da9c4994f
parent4fa58ece6239fbd5af199796d0cc77a18fdce109
parent4e6c9ead6d49f86e49bf917d210da8d195550146
Merge branch 'MDL-60959-master' of git://github.com/ryanwyllie/moodle