Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

64bfd21c

Commit 64bfd21c authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into fix_privatedata

parents edafd296 8f50d768

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/js/file-upload.js 5 additions, 1 deletion

apps/files/js/file-upload.js
apps/files/js/filelist.js 7 additions, 6 deletions

apps/files/js/filelist.js
apps/files_sharing/lib/cache.php 42 additions, 38 deletions

apps/files_sharing/lib/cache.php
core/js/share.js 4 additions, 2 deletions

core/js/share.js
lib/private/api.php 2 additions, 1 deletion

lib/private/api.php
lib/private/util.php 2 additions, 0 deletions

lib/private/util.php
settings/templates/admin.php 14 additions, 6 deletions

settings/templates/admin.php
tests/lib/preview.php 5 additions, 7 deletions

tests/lib/preview.php

with 81 additions and 61 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