Merge branch 'MDL-62753' of https://github.com/OdyX/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 13:15:40 +0000 (15:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 13:15:40 +0000 (15:15 +0200)
commit1ef11d5182c6943e5e0e2ebdee1d4db84cce6737
tree5b04279fd61a2fec25d338d47fb84ef141f2a475
parent6ce50554ee0ddc4dbfafd3277c9e2b17bf2880cc
parent90ae1b90f13f7726ab8f15cbe27ab6e9ea6a907c
Merge branch 'MDL-62753' of https://github.com/OdyX/moodle