Merge branch 'MDL-60070-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 22:03:10 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 22:03:10 +0000 (00:03 +0200)
commit35642710497afe6b756d648ce9ee34eed6520303
treea87d797fa31abbfee16fe1b9e5972613dd7188a0
parent6d170ad5089fd9ef51ad5865b62ff8a751b6403f
parent8766097ed687693df8a7ee5bfd6a0d26dc02d461
Merge branch 'MDL-60070-master' of git://github.com/lameze/moodle