Skip to content
Snippets Groups Projects
Commit 3e9a69b9 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts 

Conflicts:
	apps/contacts/ajax/contactdetails.php
	apps/contacts/js/contacts.js
parents 424c64c0 2cebfb50
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment