Merge branch 'MDL-60736-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 10:47:09 +0000 (12:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:22 +0000 (18:16 +0200)
commit6aaf27af91a811863e39799882a553bc7c7f7b79
tree92853ce0849fd433fe53c638e9d7d1267969b7af
parent67eb5572862eb5c22d7b4792d07405f0c141abcb
parentbb14a48851fcc45b2b7191074e27a02b9cd22fea
Merge branch 'MDL-60736-master' of git://github.com/jleyva/moodle