Merge branch 'MDL-61321-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 10:44:18 +0000 (12:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:19 +0000 (18:16 +0200)
commit67eb5572862eb5c22d7b4792d07405f0c141abcb
treeb9468795858547ac6b39d0db16f9d27a274bd518
parent4b96d7ce050bbc3b0d97cad1d8fa6d198f2eae81
parentbc694b47613ef081318816ed19e5f940b0baa34d
Merge branch 'MDL-61321-master' of git://github.com/jleyva/moodle