Merge branch 'MDL-68758-master' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Wed, 27 May 2020 07:46:47 +0000 (09:46 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 27 May 2020 07:46:47 +0000 (09:46 +0200)
1  2 
lib/templates/filemanager_page_generallayout.mustache
repository/lib.php

Simple merge