diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-03-07 21:49:46 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-03-07 21:49:46 +0100 |
| commit | 9908adb320171c0a12fa7d78964b5ddc3527f9fd (patch) | |
| tree | 06544ba73bced1ddc104cb2bf87e3c7672c026ad /ocs | |
| parent | faf6055baa224fbf4248a70d28ae4416c9c7eb1c (diff) | |
| parent | d8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb (diff) | |
| download | nextcloud-server-9908adb320171c0a12fa7d78964b5ddc3527f9fd.tar.gz nextcloud-server-9908adb320171c0a12fa7d78964b5ddc3527f9fd.zip | |
Merge branch 'master' into vcategories
Conflicts:
apps/contacts/lib/vcard.php
Diffstat (limited to 'ocs')
0 files changed, 0 insertions, 0 deletions