Merge branch 'MDL-62418-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 01:01:29 +0000 (03:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 01:01:29 +0000 (03:01 +0200)
commita890f2ecfa8d2e4513c9838044c09afd68e92a80
treed21146051a91cf75ab09d5e45b55d302e169c201
parent24bd0bc3b3b192677b9eabf996395e1bfa5560a4
parent5bf7f59a199e2722551fa2ba393db0900440f873
Merge branch 'MDL-62418-master' of git://github.com/sarjona/moodle