Merge branch 'MDL-60780_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 20 Nov 2017 20:52:41 +0000 (09:52 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:29 +0000 (13:24 +0100)
commit8317549dffce39d4788ea4ffe1455f5547c1c76e
tree63fb33c47969e3573d9a0814fd7ce062e04bd11d
parent5d96469c8c12f0235ab88c4aca1ba40040d99bff
parent19bf156be946a890d0ab3068f4571fff41b9091d
Merge branch 'MDL-60780_master' of git://github.com/dmonllao/moodle