]> source.dussan.org Git - nextcloud-server.git/commit
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
authorThomas Tanghus <thomas@tanghus.net>
Fri, 9 Dec 2011 14:25:26 +0000 (15:25 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Fri, 9 Dec 2011 14:25:26 +0000 (15:25 +0100)
commit7aa8eb3427679366905840b80a69e36344a5632d
tree347a2100ad445620ed21b17f9faa90fe0edb3874
parentb3661adf028570f6158dfd5092ecb1398d5be0df
parenteeaf539a4414e3081b6f6652167363a3221a1973
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup

Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
apps/contacts/ajax/deletebook.php
apps/contacts/ajax/showaddcard.php
apps/contacts/index.php
apps/contacts/js/interface.js
apps/contacts/lib/vcard.php
apps/contacts/templates/index.php