Merge branch 'MDL-70198-master-2' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 18 Mar 2021 03:41:51 +0000 (11:41 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 18 Mar 2021 03:41:51 +0000 (11:41 +0800)
commit54cc7804a8be2a95f8cd85591a6d828bcb0acea6
treeaf500660b9e6159986fb5eeb86ff05dc98833142
parent089afdfceb970178ba9d7db4babe93bfaa45936e
parentd589352f4f8f4cef2091a706600abde72ace734c
Merge branch 'MDL-70198-master-2' of git://github.com/peterRd/moodle
lang/en/admin.php
lib/navigationlib.php
lib/upgrade.txt