]> source.dussan.org Git - nextcloud-server.git/commit
More @£#¤ conflicts
authorThomas Tanghus <thomas@tanghus.net>
Wed, 8 Feb 2012 08:36:16 +0000 (09:36 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Wed, 8 Feb 2012 08:36:16 +0000 (09:36 +0100)
commit25faa40bd09f35cfc14a699d23d2d747173922d3
tree9d3f29e63daf4270f8e31842b6d8f409202821dc
parent3e9a69b9b7b67099bd3ba274a8a015f087bc2fc6
parentf4a586a52c1aeead0790ae0906523ce7aeba44bd
More @£#¤ conflicts
Merge branch 'temp' into tanghus_contacts
apps/contacts/js/contacts.js