diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-02-25 16:36:58 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-02-25 16:36:58 +0100 |
commit | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (patch) | |
tree | 5c4da1ddafb6d81feb90d3a70e927e59dc0a5e0d /lib/vobject.php | |
parent | 814bc2fd2bef739938716ae840a4db0de502422a (diff) | |
parent | 8b93a9a237603185501d0e24e9c08705168fc553 (diff) | |
download | nextcloud-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