Merge branch 'MDL-63142-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 22:18:35 +0000 (00:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 22:18:35 +0000 (00:18 +0200)
commitc6e19d9cfaeb1076231135da9f1ea897f0cbd737
tree91fd96e8ba1584f42d4d6a4e331591e15f9f6686
parent57aaa0c423d72e5695f17625fdbe70d7fb236a51
parentcbeb3995dc8f707c65e848ed57659b4021e13ce0
Merge branch 'MDL-63142-master' of git://github.com/rezaies/moodle