Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/util.php		2013-09-02 14:41:46 +02:00
..
admin.php	add type=text to ZIP size field, fix second part of #2097	2013-03-06 12:39:36 +01:00
index.php	Merge branch 'master' into sharing_mail_notification_master	2013-09-02 14:41:46 +02:00
part.breadcrumb.php	Migrate to encodePath	2013-07-09 17:46:11 +03:00
part.list.php	Merge master into oc_preview	2013-08-29 10:50:55 +02:00
upgrade.php	[Files] Use p() instead of echo	2013-02-27 21:14:15 +01:00