Thomas Müller 7425efade7 Merge branch 'master' into oc_preview ... Conflicts: 3rdparty lib/template.php		2013-07-30 00:34:36 +02:00
..
appinfo	we need to listen to the pre delete hook, otherwise the file is already gone	2013-03-13 15:39:39 +01:00
css	fix position of 'user shared the folder foldername with you' label	2013-07-04 10:32:26 +02:00
js	adding tipsy to the upload button showing the max upload and restoring client side upload size validation	2013-07-05 15:07:05 +02:00
l10n	[tx-robot] updated from transifex	2013-07-28 01:58:28 -04:00
lib	Implement getDirectoryPermissions() in Shared Permissions, fixes #2846	2013-05-29 18:22:54 -04:00
templates	initialize OC_Defaults in template constructorX	2013-07-24 11:51:21 +02:00
public.php	Merge branch 'master' into oc_preview	2013-07-30 00:34:36 +02:00