Merge branch 'MDL-59638_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 17:48:17 +0000 (19:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 17:48:17 +0000 (19:48 +0200)
commitd4c8235f87d9c0be10813457cfa896915ac7eebc
tree1929112c4a27fdb591ee11f9841d58824f961177
parent9ebc67f4a238922494b353a5a0e775e8db3d44d0
parent8f5a52b4841c906cd17bacac2187257069a95e90
Merge branch 'MDL-59638_master' of git://github.com/dmonllao/moodle