Merge branch 'MDL-62279-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
commit0c5279e4c5e16b447abea2fe28710efa61783f5b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 21:26:51 +0000 (25 23:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 21:26:51 +0000 (25 23:26 +0200)
tree9dc9a91d2b096c75351e00b3b614cc2525ce83db
parent514dce5460885f9aa3fcf31ff343bbb470a502d1
parent3cb6f1de338a9b8c9521ad9255f1f21457ee7533
Merge branch 'MDL-62279-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE