Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 5 Jun 2020 03:52:36 +0000 (11:52 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 5 Jun 2020 03:52:36 +0000 (11:52 +0800)
1  2 
lang/en/admin.php
lang/en/user.php
lib/db/services.php
theme/boost/scss/moodle/core.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge