Merge branch 'MDL-61012_master' of https://github.com/troywilliams/moodle
commit7816cac9fe2fb4c90405c226b30252be542a97df
authorJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 09:29:25 +0000 (30 17:29 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 09:29:25 +0000 (30 17:29 +0800)
tree4f16bce0e1ea139fdd88ca9556dbd5c56cffa12d
parent81fa24178824d533c04a4e2cb377305d6e3a581e
parentf9a7a98a4a795d66f4a8c5f8cabb263ecdb21d64
Merge branch 'MDL-61012_master' of https://github.com/troywilliams/moodle