diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-25 20:37:28 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-25 20:37:28 +0200 |
| commit | adcafbde34b8f4c75dbf724e929766a1f7d964d4 (patch) | |
| tree | 993d117c7f7e9773eca8e445c63475c9ef207081 /apps/files_encryption/settings-admin.php | |
| parent | 4eddef1556ac7ee7fc0c7e82279672c52d9b6db9 (diff) | |
| parent | dbb6a10364fb87989cb13f704887782a1531e16b (diff) | |
| download | nextcloud-server-adcafbde34b8f4c75dbf724e929766a1f7d964d4.tar.gz nextcloud-server-adcafbde34b8f4c75dbf724e929766a1f7d964d4.zip | |
Merge branch 'master' into fix_for_2377
Diffstat (limited to 'apps/files_encryption/settings-admin.php')
0 files changed, 0 insertions, 0 deletions