Bart Visscher cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing ... Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js		2012-08-29 20:16:39 +02:00
..
ajax	Remove useless setting of RUNTIME_NOAPPS	2012-08-08 22:42:50 +02:00
appinfo	add backticks to SQL, use limit parameter instead of LIMIT SQL	2012-08-25 01:52:27 +02:00
css	Tweak users delete notification	2012-08-04 16:44:26 -04:00
js	Merge remote-tracking branch 'gitorious/master' into routing	2012-08-29 20:16:39 +02:00
l10n	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support	2012-08-25 03:14:26 +02:00
templates	Switch to using file cache ids instead of paths for file sharing	2012-08-24 10:05:37 -04:00
admin.php	Revert	2012-06-11 13:27:32 +02:00
download.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
index.php	Merge remote-tracking branch 'gitorious/master' into routing	2012-08-29 20:16:39 +02:00
settings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00