Merge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 5 Nov 2017 21:18:46 +0000 (10:18 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 5 Nov 2017 21:18:46 +0000 (10:18 +1300)
commit6a973d261aaa7ae1349e513f98324e03844da83f
tree9fc69ad52a323709800441db28677f630ee06033
parent159b4e5d8c773fc1c71cb97e728d05f4cbb9d49e
parent4a145a8ae596a00b60555df44d994184217160df
Merge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle