Merge branch 'MDL-61153-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 09:55:28 +0000 (10:55 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 09:55:28 +0000 (10:55 +0100)
commit132106bfefb0f5e7b0ae3bfe4bb29f718aa486d1
tree8708708341135b6aa4632233ef04605ec85f66d6
parent0abe3fe3738522c5b645d9fd8b9dcbdaa82c1008
parentec819f5141be15c7b2fd29c23586091fa1d7e303
Merge branch 'MDL-61153-master' of git://github.com/mihailges/moodle