Merge branch 'MDL-62176-master' of git://github.com/bmbrands/moodle
commite55b7082bef280a1bd2bd69b17a8378cebf532c5
authorJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 03:00:17 +0000 (26 11:00 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 03:00:17 +0000 (26 11:00 +0800)
tree5743e2e39db789c95ddf7022280d8492c05ead23
parent1b4983fc90353ec360a99b2a42a9870411fdc982
parenta24bf64ffd088bae03b041ce3c3c37b9cb0b09ba
Merge branch 'MDL-62176-master' of git://github.com/bmbrands/moodle