Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master		2016-07-07 11:29:46 +02:00
..
misc	Addressbook sharing added based on a simplified approach which is based on calendar sharing standard	2015-11-19 11:34:31 +01:00
travis	Changed name of default logfile from owncloud.log to nextcloud.log.	2016-07-04 11:50:32 +02:00
unit	Merge branch 'master' into sync-master	2016-07-07 11:29:46 +02:00