Merge branch 'MDL-61986' of git://github.com/stronk7/moodle
commitbb874345cfcb9c96ff9817a7801ba809b8a24cc3
authorJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 16:47:02 +0000 (27 00:47 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 16:47:02 +0000 (27 00:47 +0800)
tree6632fbf8d6e8e541bacb3dec03e37fd41ba9e5f5
parente2afdc9c215f843d20fee9ad93e3d1ade7813211
parent75bf06128fc0c1093e04475c5ad282d5904801f5
Merge branch 'MDL-61986' of git://github.com/stronk7/moodle