Merge branch 'MDL-58494-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 07:23:50 +0000 (15:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 07:23:50 +0000 (15:23 +0800)
1  2 
mod/feedback/lib.php
mod/feedback/tests/lib_test.php

Simple merge
Simple merge