Merge branch 'MDL-63141-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 22:20:02 +0000 (00:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 22:20:02 +0000 (00:20 +0200)
commit83c249a665cff6e5b9a0f678d11cc5e760a8985d
tree33e2c6c7a0e68886e067caf98dd5a91e3ead3b62
parentc6e19d9cfaeb1076231135da9f1ea897f0cbd737
parent52c9bbbfae34ebb6eb8c3dfc58b74169b6551d91
Merge branch 'MDL-63141-master' of git://github.com/rezaies/moodle