Tom Needham cbb2db8622 Fix merge conflicts

2012-01-01 01:18:02 +00:00

..

ajax

Fix merge conflicts

2012-01-01 01:18:02 +00:00

appinfo

Editor now loads on top of files app.

2011-10-01 22:48:00 +01:00

css

make 'New' button work with firefox

2011-11-04 16:16:54 +01:00

js

Fix merge conflicts

2012-01-01 01:18:02 +00:00

l10n

updated translations

2011-09-24 23:12:18 +02:00

templates

Fix encoding again and update the link after renaming files

2011-12-28 12:47:27 -05:00

admin.php

files: fix max filesize check

2011-09-24 18:42:06 +02:00

download.php

prevent the remaining ob_clean related errors

2011-10-17 01:18:02 +02:00

index.php

Fix encoding again and update the link after renaming files

2011-12-28 12:47:27 -05:00

settings.php

Move some common code to OC_Util

2011-09-18 21:31:56 +02:00

webdav.php

Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging

2011-09-23 09:40:01 +02:00