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)
commit3d0541c03a0b4ab8104acc0f44c70a1bc9445322
treefe9f50eb4fbf1417324bd16db8dadb5b432c95a3
parentd5eec2a2fd1f8fd8cbd9a202d702419f2a162e58
parent31788c8cf2ba4e9252fd4864864b26b96503d705
Merge branch 'MDL-68758-master' of git://github.com/peterRd/moodle
lib/templates/filemanager_page_generallayout.mustache
repository/lib.php