Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload ... Conflicts: lib/base.php lib/filestorage.php		2011-07-29 20:42:24 +02:00
..
ajax	port sharing by publiclink fully to the 2.0 codebase and provide a simple gui for it	2011-06-02 02:46:50 +02:00
appinfo	change db index names to avoid collisions	2011-06-18 23:57:03 +02:00
css	port sharing by publiclink fully to the 2.0 codebase and provide a simple gui for it	2011-06-02 02:46:50 +02:00
js	forgot "event" as a parameter.	2011-06-19 14:23:24 +02:00
templates	removed some more legacy CSS	2011-07-29 04:24:02 +02:00
admin.php	Delete requires in applications where possible	2011-07-27 19:25:49 +02:00
get.php	Delete requires in applications where possible	2011-07-27 19:25:49 +02:00
lib_public.php	Fix expiring of public links	2011-07-17 17:41:46 +02:00