sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
nextcloud-server/lib
History
Thomas Müller bb6fac1102 Merge branch 'master' into contactsmanager-register 
Conflicts:
	lib/private/contactsmanager.php
 		2014-05-19 21:35:13 +07:00
..
l10n [tx-robot] updated from transifex 2014-05-19 01:54:46 +07:00
private Merge branch 'master' into contactsmanager-register 2014-05-19 21:35:13 +07:00
public Merge branch 'master' into contactsmanager-register 2014-05-19 21:35:13 +07:00
autoloader.php Remove all occurences of @brief and @returns from PHPDoc 2014-05-19 17:50:53 +07:00
base.php Remove all occurences of @brief and @returns from PHPDoc 2014-05-19 17:50:53 +07:00