Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 07:13:53 +0000 (09:13 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 07:13:53 +0000 (09:13 +0200)
commit1d6dd4388d180608d88f93afad876924d93b100a
tree4b61d646bdf5c916f2da6258762877b73e5797c7
parent17ed12eb17db0f2df10dc81cd4d11fce949bafc8
parent6d32804f8a742d30b7e456867a7c6962cd832a5d
Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle