Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Jun 2018 09:57:31 +0000 (17:57 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Jun 2018 09:57:31 +0000 (17:57 +0800)
commitec4d05c6b67516e6307dd61aca8e066bcc2fbc03
treeeade192c70bfcee4d10e06817a80a7038694384d
parentfca5c2de0528a2f83a29183fc5c92f463618182a
parente6914883ed353a72397f4d49b1041b7407ac4c1d
Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle