Merge branch 'MDL-38301-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 10:44:50 +0000 (12:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 10:44:50 +0000 (12:44 +0200)
commitdfc6f782e163de3dbc974c2e21246515e960bb6e
tree73f3d0f5274a235f3655e5080cf43f833a10eebc
parentc4aa41ca2f298a9d499980bec4e114b7746a29dd
parent8f7d07fa7d6a171a5396fbaf69be1be38771d7f5
Merge branch 'MDL-38301-master' of git://github.com/junpataleta/moodle