Merge branch 'MDL-54869-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Jul 2016 02:30:17 +0000 (10:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Jul 2016 02:30:17 +0000 (10:30 +0800)
1  2 
lib/filelib.php
webservice/upload.php

diff --cc lib/filelib.php
Simple merge
Simple merge