Merge branch 'wip-MDL-50923-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Aug 2015 09:34:33 +0000 (11:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Aug 2015 09:34:33 +0000 (11:34 +0200)
1  2 
lib/outputrenderers.php

Simple merge