Merge branch 'wip-MDL-56370-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 11:13:20 +0000 (13:13 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 11:13:20 +0000 (13:13 +0200)
1  2 
mod/feedback/lib.php

Simple merge