Merge branch 'MDL-61016_hideif_disabledif' of git://github.com/davosmith/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Dec 2017 05:16:18 +0000 (06:16 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Dec 2017 05:16:18 +0000 (06:16 +0100)

Trivial merge