Merge branch 'MDL-64346-36' of git://github.com/abgreeve/moodle into MOODLE_36_STABLE
commit41da53abe4fcafa2058e5501a700a953f7b8b544
authorSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 14:38:28 +0000 (15 15:38 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 14:38:28 +0000 (15 15:38 +0100)
tree2b372b867787eb2643dc374910216909c3dc6a0f
parent1c8abf9e96f66d98a52f8dc5170b3544cf64dc52
parent793727d8f43f72bc876709c5bebb8cea9c778840
Merge branch 'MDL-64346-36' of git://github.com/abgreeve/moodle into MOODLE_36_STABLE