Merge branch 'wip-MDL-56246-master' of https://github.com/kwiliarty/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 00:04:19 +0000 (01:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 00:04:19 +0000 (01:04 +0100)
commit974e820e535103dc238c36f74a6b08d1307941f4
tree4e42d2b108a82e1b06a425996c3cc723991159ab
parent1403c0d57a4c978fccdff3149b7ea2f180428d98
parent8284ffede3631e26bd23f1268abe5a7df159b9de
Merge branch 'wip-MDL-56246-master' of https://github.com/kwiliarty/moodle