diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-27 18:09:35 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-27 18:09:35 +0200 |
| commit | 2c3c60c1af1d789856760b79def8439f9fac6e96 (patch) | |
| tree | f820dd2dbe6d23b265eca1c07c3c9f0604cf42ce /apps/files_encryption/tests/util.php | |
| parent | c81e34ef899617d4c0280bd3b19d5ef7da31d158 (diff) | |
| parent | 4c05259ccfbb7e2f0083794172eaa7c06f4b2592 (diff) | |
| download | nextcloud-server-2c3c60c1af1d789856760b79def8439f9fac6e96.tar.gz nextcloud-server-2c3c60c1af1d789856760b79def8439f9fac6e96.zip | |
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
Diffstat (limited to 'apps/files_encryption/tests/util.php')
0 files changed, 0 insertions, 0 deletions