Merge branch 'MDL-63625-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 12:41:12 +0000 (14:41 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 12:41:12 +0000 (14:41 +0200)
commitd10643fbe66adf4187c98a5c66e7349f606abaad
tree04f05b1e5f22d7cd857a675078aed83ab5e0d1ef
parent57846fd010bf602ff48797d1383d9bb9d70c74f3
parentd8c50267b92135ca984864cbdf517067c023ed8a
Merge branch 'MDL-63625-master' of git://github.com/marinaglancy/moodle