Merge branch 'MDL-60363-master' of https://github.com/Kathrin84/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 23:41:39 +0000 (00:41 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:59 +0000 (17:54 +0100)
commitb81e81b162259e09cb4b8788606232edce8ec6da
treedbe30c23943b6b129023743d6d41c9b003146ecc
parentbb3e956ed9a740e9185566f429644e7301f58fe4
parente20b490da313b951b579ff6d2ed8ac6f5e8d6a8b
Merge branch 'MDL-60363-master' of https://github.com/Kathrin84/moodle