]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
authorThomas Tanghus <thomas@tanghus.net>
Wed, 8 Feb 2012 07:33:51 +0000 (08:33 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Wed, 8 Feb 2012 07:33:51 +0000 (08:33 +0100)
commit3e9a69b9b7b67099bd3ba274a8a015f087bc2fc6
tree92b91e1bb2f437760acc0b3aab392ab94013187f
parent424c64c0eb3b7b9402029c0543c0844f89ff9833
parent2cebfb50a4214dd5a856830bf65370f487b746f5
Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts

Conflicts:
apps/contacts/ajax/contactdetails.php
apps/contacts/js/contacts.js
apps/contacts/ajax/contactdetails.php
apps/contacts/js/contacts.js