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

eade87dc

Commit eade87dc authored 12 years ago by Florin Peter

Downloads
- Plain Diff

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

parents f6ac34af 8a46e809

No related branches found

No related tags found

Loading

Changes 2

Show whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/hooks/hooks.php 14 additions, 7 deletions

apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php 0 additions, 51 deletions

apps/files_encryption/lib/util.php

with 14 additions and 58 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