Merge branch 'wip-MDL-59136-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 16:08:21 +0000 (18:08 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:46 +0000 (18:24 +0200)
commitd4bd3dbb693969efe43d6f25496c495ded29af2a
treed2e64a5498b8f16aa4a11527b6269b9a3d717300
parent6ac5f70c010d9ae331c4a602869759dd10cfe514
parent1c4a0506e55c9a85b4d91f1908f127d0465cc677
Merge branch 'wip-MDL-59136-master' of git://github.com/marinaglancy/moodle