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

41cfd55f

Commit 41cfd55f authored 13 years ago by Tom Needham

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud

parents 0aafc717 ebfc5b27

Branches

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

apps/contacts/thumbnail.php 1 addition, 0 deletions

apps/contacts/thumbnail.php
apps/gallery/ajax/thumbnail.php 1 addition, 0 deletions

apps/gallery/ajax/thumbnail.php
apps/gallery/templates/index.php 1 addition, 0 deletions

apps/gallery/templates/index.php
lib/cache/apc.php 8 additions, 0 deletions

lib/cache/apc.php
lib/connector/sabre/auth.php 1 addition, 1 deletion

lib/connector/sabre/auth.php
lib/json.php 10 additions, 0 deletions

lib/json.php
lib/util.php 4 additions, 3 deletions

lib/util.php
settings/js/log.js 1 addition, 1 deletion

settings/js/log.js

with 27 additions and 5 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