Merge branch 'MDL-56881-master' of https://github.com/snake/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 12:38:19 +0000 (14:38 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 12:38:19 +0000 (14:38 +0200)
commit6ce50554ee0ddc4dbfafd3277c9e2b17bf2880cc
tree7c6652631a9bf354adf614bc6d591ab02c49ee27
parent5edfece170402cbd428c7e0e316f8a71ccc6338c
parent5a8791336aea41d05d5b7ebb7490da36c2567aac
Merge branch 'MDL-56881-master' of https://github.com/snake/moodle