Merge branch 'MDL-61839-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 21:52:08 +0000 (23:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 21:52:08 +0000 (23:52 +0200)
commitff4bab999b41620061db798adc2d7d4744a72fbd
tree0c9a09bfef3196978e7bf4bdf5c5ea903f4ac8f3
parent521ebb76b08c3a151b1a583a5f2d4d99201355e5
parent9d98033ff95da06fb6f2b22ad25e2abc4661cd55
Merge branch 'MDL-61839-master' of git://github.com/mihailges/moodle