Merge branch 'MDL-58820-master' of https://github.com/nwp90/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Jun 2017 09:08:25 +0000 (11:08 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:03 +0000 (12:32 +0100)
commit6c79f56fe05c5a03236c8d8cb0d1caaf0f581ff0
tree2c60eec633081192100f28a5519c788c01fe24a8
parentef9b236d8a85ad5f09bb23704d7c04c1205edb3d
parent3543eabc36007427f683fb51bce8107bafa59bfd
Merge branch 'MDL-58820-master' of https://github.com/nwp90/moodle