Merge branch 'MDL-63215-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
commit8b16f4d7f21c8cc21a2f856f1002dc775dfe06f8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 08:43:28 +0000 (17 10:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 08:43:28 +0000 (17 10:43 +0200)
treec9c35e82c6708c9cecd1815bea92c72e1154389d
parent09b00ee19ca95c37e096af833508680d99084efa
parentaa21de4c84f6ffd01c707e1a9328fa0a68f396be
Merge branch 'MDL-63215-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE