Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master ... Conflicts: apps/files/index.php apps/files/templates/index.php		2013-10-04 12:30:49 +02:00
..
private	Merge branch 'master' into sharing_mail_notification_master	2013-10-04 12:30:49 +02:00
public	Merge branch 'master' into sharing_mail_notification_master	2013-10-02 10:11:18 +02:00
autoloader.php	Merge pull request #5071 from owncloud/fix-autoloader-master	2013-10-02 03:10:10 -07:00
base.php	Merge branch 'master' into lib-private-master-2	2013-09-30 21:29:58 +02:00