Arthur Schiwon 42c66efea5 Merge branch 'master' of https://github.com/owncloud/core into downstream-160611		2016-06-11 15:34:43 +02:00
..
appinfo	Merge branch 'master' of https://github.com/owncloud/core into downstream-160611	2016-06-11 15:34:43 +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 pull request #24080 from owncloud/support-calendar-class-property	2016-06-10 11:22:11 +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 pull request #24080 from owncloud/support-calendar-class-property	2016-06-10 11:22:11 +02:00
.gitignore	Introducing CardDAV into core	2015-11-06 15:26:51 +01:00