Merge branch 'MDL-68667-master' of git://github.com/aanabit/moodle
authorSara Arjona <sara@moodle.com>
Wed, 27 May 2020 10:26:46 +0000 (12:26 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 27 May 2020 10:26:46 +0000 (12:26 +0200)
1  2 
lib/behat/classes/behat_core_generator.php
repository/filepicker.js

Simple merge