Merge branch 'MDL-62500-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 May 2018 11:37:16 +0000 (13:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 May 2018 11:37:16 +0000 (13:37 +0200)
commit6b47d8066a4c7d4c3318bc03b00824f88c99ed60
treed960653afa26b5479451848f5b10cc934a68651d
parenta765519a4215b432b4a9ad34e212cfb0a4f4f895
parent39e14b2325c4a9c2011cee640465032b0b4d519b
Merge branch 'MDL-62500-master' of git://github.com/andrewnicols/moodle