Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 01:32:58 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 01:32:58 +0000 (09:32 +0800)
1  2 
repository/googledocs/lib.php
repository/onedrive/lib.php

Simple merge
Simple merge