Merge branch 'MDL-62376-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 12:47:32 +0000 (14:47 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 12:47:32 +0000 (14:47 +0200)
commit76fc9a4f5a87bd80e8d1c11eef2d66d9b6f66413
tree2472a5a190cb7d2fb3705a0d8e83e3c362ab5ed7
parent5da250d027bd290a70f2f04de8daaadedbe4cc50
parentd2d150b21d2b0b0d966be2d0c1737392ead21b4d
Merge branch 'MDL-62376-master' of git://github.com/bmbrands/moodle