Merge branch 'MDL-61896-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:41:21 +0000 (23:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:41:21 +0000 (23:41 +0200)
commit3b8c9ab2b835c1e45124fcdc02f19421ab0a1cbd
treeeecd4330c6d8ea09ce2e4f086477bdffa7bb9ac4
parent74e48d168fcb6ac7246a0187faa58daab4026d8d
parente484db7c94f87f1b4077a9874cc39a6aafae378f
Merge branch 'MDL-61896-master' of git://github.com/andrewnicols/moodle