Merge branch 'MDL-65094-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
commit40df7183988965e1df37f955ed7e6303d954bf0b
treeec80ee6b440e69cceb0f773fb4f8cda69d063685
parentd52f83a37a9a9a5157b73d8b5cd5351aebfeccb3
parent0b23fad474c8ed3fa4da1cc10825a5ed020a3fc5
Merge branch 'MDL-65094-master' of git://github.com/rezaies/moodle
admin/renderer.php
lib/moodlelib.php