Merge branch 'wip-MDL-60591-33' of git://github.com/marinaglancy/moodle into MOODLE_3...
commit108411af390382165af1e4e8a12d9d80b2d608a6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:38:50 +0000 (28 22:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:38:50 +0000 (28 22:38 +0100)
tree6e1a02d3c1f401b0ef37c793c9b3b17e6bffbfe0
parent3104923f6b736e954e4098b98789aa205c7d4991
parent907832b43b30cb1c8c2a68d029604c0944d780b0
Merge branch 'wip-MDL-60591-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE