]> source.dussan.org Git - nextcloud-server.git/commit
Fix conflict.
authorThomas Tanghus <thomas@tanghus.net>
Wed, 7 Mar 2012 19:57:05 +0000 (20:57 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Wed, 7 Mar 2012 19:57:05 +0000 (20:57 +0100)
commit57c4d39b1e0becaeeb795cfbfd70f525bd89b9d8
tree5a12c8c7d83574b9bff3e4271e88ec740820c2aa
parent75323b86d157c48031b9ac8c151e4a41577a1481
parentcf5d63f0abc2b4537098962ad5051180861f965b
Fix conflict.
apps/contacts/css/contacts.css
apps/contacts/js/contacts.js
apps/contacts/lib/app.php