]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into contactsmanager-register
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 19 May 2014 19:35:13 +0000 (21:35 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 19 May 2014 19:35:13 +0000 (21:35 +0200)
commitbb6fac1102e2d029288c1689ca9bcdf09fad2354
tree69134333600aa3e6b77058fa48d76a7bb071a947
parent7c0370105af504e31fa2d6be088273a3bba7262f
parentb6d2d6329d99c47fa8a01a7a8db7f8f2de6b9f74
Merge branch 'master' into contactsmanager-register

Conflicts:
lib/private/contactsmanager.php
lib/private/contactsmanager.php
lib/public/contacts/imanager.php