Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:55:23 +0000 (00:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:55:23 +0000 (00:55 +0100)
1  2 
mod/glossary/lib.php

Simple merge