Merge branch 'wip-MDL-59377-master-3' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 09:04:02 +0000 (11:04 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 09:04:02 +0000 (11:04 +0200)
commit57f869c184ae813663bd1c5c2a0ba494dfd5e5dc
tree855551585b54850b75a6e8f80ed4f8e59a6ce039
parent125016633812c12540f92525e086c5eed00445a3
parent1bc9ef82c926c4fe352eaeb78c6f3b656a816f64
Merge branch 'wip-MDL-59377-master-3' of git://github.com/marinaglancy/moodle