]> source.dussan.org Git - nextcloud-server.git/commit
Resolved conflict
authorThomas Tanghus <thomas@tanghus.net>
Fri, 9 Dec 2011 14:28:51 +0000 (15:28 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Fri, 9 Dec 2011 14:28:51 +0000 (15:28 +0100)
commit5cb10548b30544c0407294fa7e520479673f956c
tree094a823e849e4d34d7e1b6c75b48df5479345c48
parent7aa8eb3427679366905840b80a69e36344a5632d
Resolved conflict
apps/contacts/index.php