]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Tue, 24 Apr 2012 19:59:56 +0000 (21:59 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Tue, 24 Apr 2012 19:59:56 +0000 (21:59 +0200)
commitf17eea506afaab0c0755d0fefe3a3f62eeb38e9d
treeb5c1f8a33aef46f1a718d5313bef8f4e52700acf
parentd6346b5b0bece4feecc36b7b97308dd3a5a4d6cc
parent9b134b063683aca678e19912ebc3928321751714
fix merge conflicts
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/js/contacts.js