Merge branch 'wip-MDL-51239-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 11:58:28 +0000 (11:58 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 11:58:28 +0000 (11:58 +0000)
1  2 
blog/edit.php
blog/index.php

diff --cc blog/edit.php
Simple merge
diff --cc blog/index.php
Simple merge