Merge branch 'MDL-44791-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 16:59:41 +0000 (18:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 16:59:41 +0000 (18:59 +0200)
commit706898c83e8c93adb8cf4918a5103bdbf62974d2
treefce7c5ae2ee378f45258fd2198a2bc3bd74e71a6
parent3a55517a53fba050740ddcba3bc27e9fb61541c9
parentb1a8a5052cefb4d86d2186223f4bf10e47a33bb7
Merge branch 'MDL-44791-master' of https://github.com/lucaboesch/moodle