Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 19 Nov 2017 21:34:55 +0000 (10:34 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 19 Nov 2017 21:34:55 +0000 (10:34 +1300)
1  2 
mod/glossary/lib.php

Simple merge