Merge branch 'MDL-62460-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:41:37 +0000 (01:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:41:37 +0000 (01:41 +0200)
commit3036620e0b2f43fe01197b74fa4df21a783c6a7a
tree95c8271b0c2a837b9d2970283a99da202957ccc5
parent3afd0a252337d14eafa33fdd006a1fdf24e28534
parent9e76aac08e131b80baec2050fcb61cf85b843d8f
Merge branch 'MDL-62460-master' of git://github.com/junpataleta/moodle