Merge branch 'MDL-59614-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 23:48:35 +0000 (01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 23:48:35 +0000 (01:48 +0200)
commit9af66ed103aff501581028575d94b98bcf80317a
tree0969766e4ba9708f971f73d967acefdfd4611de0
parenta0d85e1828b9002f8939ba6bbbbd095a97558dab
parent85437c91f8c3a3095d0c53334319b2c5f03de554
Merge branch 'MDL-59614-master' of git://github.com/junpataleta/moodle