Merge branch 'MDL-62371-master' of git://github.com/andrewnicols/moodle
commit24bd0bc3b3b192677b9eabf996395e1bfa5560a4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 00:37:38 +0000 (14 02:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 00:37:38 +0000 (14 02:37 +0200)
treed3a4aea28584d37141971c7634da2e992e795979
parent28ec28e026df27962511ee06eb63990cae6f2edf
parent563852791d92ca81ef20063040ea7e06176b08f1
Merge branch 'MDL-62371-master' of git://github.com/andrewnicols/moodle