Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master		2016-07-07 11:29:46 +02:00
..
appinfo	Merge remote-tracking branch 'upstream/master' into master-upstream-sync	2016-06-26 12:55:05 +02:00
bin	Initial implementation of the new chunked upload - as specified in https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/	2016-04-12 12:32:04 +02:00
lib	Merge branch 'master' into sync-master	2016-07-07 11:29:46 +02:00
templates	In case of exception we return an html page in case the client is a browser	2016-03-24 19:02:16 +01:00
tests	Merge branch 'master' into sync-master	2016-07-07 11:29:46 +02:00
.gitignore	Introducing CardDAV into core	2015-11-06 15:26:51 +01:00