1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
OwncloudContactsOfficial/js
Thomas Tanghus 7a63a0cbc5 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
2011-12-09 15:25:26 +01:00
..
interface.js Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-09 15:25:26 +01:00