Merge branch 'wip-MDL-58523-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Jun 2017 09:19:48 +0000 (11:19 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:03 +0000 (12:32 +0100)
commit736973d604a5e0f88ec8539a13f274efc1a37337
tree40b5b2ec974ff01031fab637ae266bfb3a80aeca
parente037a6a12675684515023eb04d041ca87012f216
parentc3c97e2ee2302971136e10f7dedb59f95e7d46d8
Merge branch 'wip-MDL-58523-master' of git://github.com/marinaglancy/moodle