summaryrefslogtreecommitdiffstats
path: root/lib/vobject.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-25 16:36:58 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-25 16:36:58 +0100
commitea8f71a19c59e7138d4a504bacc0beb410fc77e8 (patch)
tree5c4da1ddafb6d81feb90d3a70e927e59dc0a5e0d /lib/vobject.php
parent814bc2fd2bef739938716ae840a4db0de502422a (diff)
parent8b93a9a237603185501d0e24e9c08705168fc553 (diff)
downloadnextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.tar.gz
nextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.zip
Merge branch 'master' into encryption
Diffstat (limited to 'lib/vobject.php')
0 files changed, 0 insertions, 0 deletions