Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

629faf6d

Commit 629faf6d authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into appframework-master

parents 5462e199 5899485c

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/connector/sabre/directory.php 7 additions, 1 deletion

lib/connector/sabre/directory.php
lib/connector/sabre/file.php 8 additions, 1 deletion

lib/connector/sabre/file.php
lib/connector/sabre/node.php 11 additions, 0 deletions

lib/connector/sabre/node.php
lib/connector/sabre/objecttree.php 41 additions, 3 deletions

lib/connector/sabre/objecttree.php
lib/preview/txt.php 10 additions, 0 deletions

lib/preview/txt.php
lib/util.php 0 additions, 9 deletions

lib/util.php
tests/data/testcal.ics 13 additions, 0 deletions

tests/data/testcal.ics
tests/data/testcontact.vcf 6 additions, 0 deletions

tests/data/testcontact.vcf
tests/lib/connector/sabre/objecttree.php 87 additions, 0 deletions

tests/lib/connector/sabre/objecttree.php
tests/lib/preview.php 42 additions, 1 deletion

tests/lib/preview.php

with 225 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment