]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into vcategories
authorBart Visscher <bartv@thisnet.nl>
Wed, 7 Mar 2012 20:49:46 +0000 (21:49 +0100)
committerBart Visscher <bartv@thisnet.nl>
Wed, 7 Mar 2012 20:49:46 +0000 (21:49 +0100)
commit9908adb320171c0a12fa7d78964b5ddc3527f9fd
tree06544ba73bced1ddc104cb2bf87e3c7672c026ad
parentfaf6055baa224fbf4248a70d28ae4416c9c7eb1c
parentd8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb
Merge branch 'master' into vcategories

Conflicts:
apps/contacts/lib/vcard.php
apps/contacts/lib/app.php
apps/contacts/lib/vcard.php