diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-30 00:45:29 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-30 00:45:29 +0200 |
| commit | 313631edf6aac23a68ab70bd3c0d6f0d6b59b894 (patch) | |
| tree | 16747f433c8ee6eee6e2f7d89b1eae4c749226bf /lib/public/app.php | |
| parent | 1337f48d64cd6ac99b28a0d6bfc20509ea9e6bff (diff) | |
| parent | 2ce555fe55911ba5fe6c6bdbc6a306753b57ab6e (diff) | |
| download | nextcloud-server-313631edf6aac23a68ab70bd3c0d6f0d6b59b894.tar.gz nextcloud-server-313631edf6aac23a68ab70bd3c0d6f0d6b59b894.zip | |
Merge branch 'master' into file_encryption_external_storage_fixes
Conflicts:
apps/files_encryption/hooks/hooks.php
Diffstat (limited to 'lib/public/app.php')
0 files changed, 0 insertions, 0 deletions