diff options
| author | Mario <mario@mariovavti.com> | 2021-03-04 08:17:07 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-04 08:17:07 +0000 |
| commit | 129f8107d317df190b73ce18945c50ddc27d2969 (patch) | |
| tree | f36b37b759bb3fd033202a2b5e50a3bca15f0485 /app/carddav.apd | |
| parent | 9389abdb757d5cb5b4b4322260e86c47d11ff043 (diff) | |
| parent | cb0199603908e617e10a4d8ba8ec569a59178e6b (diff) | |
| download | volse-hubzilla-129f8107d317df190b73ce18945c50ddc27d2969.tar.gz volse-hubzilla-129f8107d317df190b73ce18945c50ddc27d2969.tar.bz2 volse-hubzilla-129f8107d317df190b73ce18945c50ddc27d2969.zip | |
merge conflict
Diffstat (limited to 'app/carddav.apd')
0 files changed, 0 insertions, 0 deletions