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

0b40c1d0

Commit 0b40c1d0 authored 11 years ago by Björn Schießle

Downloads
- Plain Diff

Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption

parents ca6a77d3 d7dc710c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/ajax/adminrecovery.php 2 additions, 62 deletions

apps/files_encryption/ajax/adminrecovery.php
apps/files_encryption/lib/helper.php 92 additions, 0 deletions

apps/files_encryption/lib/helper.php
apps/files_encryption/lib/util.php 2 additions, 2 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php 16 additions, 1 deletion

apps/files_encryption/tests/crypt.php
apps/files_encryption/tests/keymanager.php 23 additions, 0 deletions

apps/files_encryption/tests/keymanager.php
apps/files_encryption/tests/share.php 142 additions, 2 deletions

apps/files_encryption/tests/share.php
lib/public/share.php 25 additions, 28 deletions

lib/public/share.php

with 302 additions and 95 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