Merge branch 'MDL-37390-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 23:25:15 +0000 (00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 23:25:15 +0000 (00:25 +0100)
commit2b2cad6f0a0c951c9014828372e6ab9bd56880f6
tree399733d4e1abe37859ee3fb967831fee0f1cbc30
parentd2d919e4780db2466016b5512a3b9d917812029f
parent6363c9ade251a64d2fe572c63280c1b750e726df
Merge branch 'MDL-37390-master' of git://github.com/sarjona/moodle