Merge branch 'MDL-52990-email-themes' of https://github.com/brendanheywood/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 11:17:54 +0000 (11:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 11:17:54 +0000 (11:17 +0000)
1  2 
lib/moodlelib.php
mod/forum/lib.php

Simple merge
Simple merge