Merge branch 'MDL-64281-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
commit99774ce0c394fe859af81eb528ed77b63307f2a2
tree41e0964f24168bd8cd7fa59c0b745939ef67b7d5
parenta99ef60c6b560615c34f0ad63d5fc76279d6a1ec
parentb5d889be10dfc4354f0c2abd295c0e15ace86de3
Merge branch 'MDL-64281-master' of git://github.com/jleyva/moodle
lang/en/admin.php
lib/weblib.php