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

5745b68f

Commit 5745b68f authored 10 years ago by Björn Schießle

Downloads
- Plain Diff

Merge pull request #13311 from owncloud/fix_restore_keys

adapt decrypt all to the new folder structure

parents 65ee2b1d 89f17ef6

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/lib/util.php 52 additions, 7 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/util.php 83 additions, 14 deletions

apps/files_encryption/tests/util.php
lib/private/util.php 4 additions, 4 deletions

lib/private/util.php
settings/ajax/deletekeys.php 3 additions, 5 deletions

settings/ajax/deletekeys.php
settings/ajax/restorekeys.php 3 additions, 12 deletions

settings/ajax/restorekeys.php

with 145 additions and 42 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