Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/public/share.php		2013-09-23 11:18:00 +02:00
..
admin.php	add type=text to ZIP size field, fix second part of #2097	2013-03-06 12:39:36 +01:00
fileexists.html	simplify conflict template handling, fix reopen after ESC	2013-09-18 17:22:29 +02:00
index.php	Merge branch 'master' into sharing_mail_notification_master	2013-09-16 10:40:06 +02:00
part.breadcrumb.php	Migrate to encodePath	2013-07-09 17:46:11 +03:00
part.list.php	Ajax calls for "files" and "files_trashbin" apps	2013-09-13 19:59:14 +02:00
upgrade.php	[Files] Use p() instead of echo	2013-02-27 21:14:15 +01:00