nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into contactsmanager-register	Thomas Müller	2014-05-19	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: lib/private/contactsmanager.php
\| *	Fix @return array PHPDocs, in /lib	Robin McCorkell	2014-05-13	1	-2/+2
\| \|
* \|	Fix wrong var name	Bart Visscher	2014-04-26	1	-1/+1
\| \|
* \|	Merge branch 'master' into contactsmanager-register	Bart Visscher	2014-04-26	1	-1/+6
\|\\| \| \| \| \| \| \| \| \|	Conflicts: lib/private/contactsmanager.php
\| *	Change key to addressbook-key	Tobia De Koninck	2014-04-22	1	-1/+1
\| \|
\| *	Add key to every contact	LEDfan	2014-04-18	1	-1/+6
\| \|
* \|	camelCase vars in OC\ContactsManager	Bart Visscher	2014-04-17	1	-34/+34
\| \|
* \|	Supply the contactsmanager object to the callbacks	Bart Visscher	2014-04-10	1	-1/+1
\| \|
* \|	$key is not needed for registering contactsmanager callbacks	Bart Visscher	2014-04-10	1	-3/+2
\| \|
* \|	Implement the register function of OC\ContactsManager	Bart Visscher	2014-04-09	1	-12/+48
\|/
*	More PHPDoc fixes, using scrutinizer patches as hints	Bart Visscher	2014-02-28	1	-2/+2
\|
*	move the private namespace OC into lib/private - OCP will stay in lib/public	Thomas Müller	2013-09-30	1	-0/+145
	Conflicts: lib/private/vcategories.php