Merge branch 'MDL-59748-master-2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Aug 2017 09:49:05 +0000 (11:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Aug 2017 09:49:05 +0000 (11:49 +0200)
commit455974b3957be8f79d1ca079e5723ccfeedc596f
tree6a63fc71c87554b8373ebd8e87ced066b0dfec55
parentc036256d868518d5e3ca9b5cd5c56c953587ad88
parent63ce49df9bb3aa6c04290121df414b7b91ea73ae
Merge branch 'MDL-59748-master-2' of git://github.com/andrewnicols/moodle