Merge branch 'MDL-62792' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:54:44 +0000 (00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:54:44 +0000 (00:54 +0200)
1  2 
lib/filterlib.php

Simple merge