Merge branch 'MDL-68548' of https://github.com/Neosi/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 00:55:51 +0000 (08:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 00:55:51 +0000 (08:55 +0800)
commitae346c8624cffdd2b157e3718929a986f50b96a5
treed9f872d4d288eec1ee37cf61088d1b958d23daaf
parent9d67c34709b8126c8603a701066aa2b1e3463295
parent27e44c18fe201b9fe2bb75c43c76aa5554f06809
Merge branch 'MDL-68548' of https://github.com/Neosi/moodle
lib/editor/atto/tests/behat/customtoolbar.feature
lib/editor/atto/tests/behat/disablecontrol.feature