Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Apr 2017 07:55:45 +0000 (09:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Apr 2017 07:55:45 +0000 (09:55 +0200)
commit7a217200393ad226192d900588cf41890990c9df
treecd353907a67405684c50f477bb8c5a295f6bdef5
parentaf282469b4f34cd176a588e52e99e6978517765b
parent56236c7d862b4b3affa4466937c901735bf56010
Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle