]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into contactsmanager-register
authorBart Visscher <bartv@thisnet.nl>
Sat, 26 Apr 2014 08:55:25 +0000 (10:55 +0200)
committerBart Visscher <bartv@thisnet.nl>
Sat, 26 Apr 2014 08:55:25 +0000 (10:55 +0200)
commitfc9371ae1099999a5d5bbda0fe1c143dd6790831
tree4dbe18b15a620d88d6e9326c4ddbdda768d3111b
parent9583549556c91b109c3965ea40f708a0f46c8f51
parentc591cf0836720a4cfc6d441b363ece46ed19eadc
Merge branch 'master' into contactsmanager-register

Conflicts:
lib/private/contactsmanager.php
lib/private/contactsmanager.php