Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg ... Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php		2014-01-30 22:50:20 +08:00
..
app.php	Added error message for when target folder was removed	2014-01-29 12:46:11 +01:00
capabilities.php
helper.php	Use $storageInfo['free']	2014-01-29 21:24:31 +08:00