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)
commit618b13e1f5b8622c2da0ed736a36ce3a0c224b52
tree34978bb58cd59d2f7b452d0c74ba9061c3f7326b
parentd1b2d3f36fb030ced7b0e4ed9944e3fc58bfb983
parentb1e6d8b86f80a792f9810b914e818f57525f2cab
Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle
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