Merge branch 'MDL-61251-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:50:39 +0000 (11:50 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:50:39 +0000 (11:50 +0100)
commit69b4a73de8372adbf4b1d25fbb8faa7e9c7ed22e
tree10eb0081ba0d2d30a6cdeb13fe807128927f1e1d
parent1cc79637c7413f65d80e10ba4fff86c70146eb7e
parent1477e62936025d469965fc8ee535a295cff2b56f
Merge branch 'MDL-61251-master' of https://github.com/lucaboesch/moodle