Merge branch 'MDL-61843-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 11:42:43 +0000 (13:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 11:42:43 +0000 (13:42 +0200)
commit8373df968751a42be3d61360ec3b906da3e88fbb
tree9f9c4433ec72e2de43a64816cd377e785ee462a0
parentfbfd69a8650549f247e2577acde9cc2c93e4a559
parent13840b978dd0d2fb9ed8c8514f827cf78268e2d6
Merge branch 'MDL-61843-master' of git://github.com/mihailges/moodle