diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-07-02 13:54:31 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-02 13:54:31 +0200 |
| commit | 3fc5b34247cc30809ca525b96e73f1448e5b2e9b (patch) | |
| tree | e92a0b479329a3f386452396b595a38cac61e4b4 /apps/files_encryption/hooks | |
| parent | 38ed00398f4df27967ae771c54a6a8f6bed07dbd (diff) | |
| parent | 29dd7eda2de629024548ddef419f1d6991ae07a6 (diff) | |
| download | nextcloud-server-3fc5b34247cc30809ca525b96e73f1448e5b2e9b.tar.gz nextcloud-server-3fc5b34247cc30809ca525b96e73f1448e5b2e9b.zip | |
Merge branch 'master' into encryption_check_php_version
Conflicts:
apps/files_encryption/files/error.php
Diffstat (limited to 'apps/files_encryption/hooks')
0 files changed, 0 insertions, 0 deletions