Merge branch 'wip-MDL-59263-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 16:02:09 +0000 (18:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 16:02:09 +0000 (18:02 +0200)
commit9ee6de43895f69264c029e6fdf67c14acea0f28a
tree2476b3b6c55734b3377a5042e4e583db150382c9
parent42a78077c65f4ffb68e41cb6391a9d9f24a6d881
parent509679e203815b710a24650ea9f08d5d9778e690
Merge branch 'wip-MDL-59263-master' of git://github.com/marinaglancy/moodle