diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-22 15:29:22 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-22 15:29:22 +0200 |
| commit | ee53bd1aa3e3cb62a93dfda66141e3537426d5dd (patch) | |
| tree | 376c87af2bb2629cb1c38098517bec8590bf6107 /apps/files_encryption/templates/settings-personal.php | |
| parent | c6722581f982d05909664171bd66cc7ec2a2a67b (diff) | |
| parent | 26732ecaa63f054f76e34b276668310f344ee50b (diff) | |
| download | nextcloud-server-ee53bd1aa3e3cb62a93dfda66141e3537426d5dd.tar.gz nextcloud-server-ee53bd1aa3e3cb62a93dfda66141e3537426d5dd.zip | |
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
Diffstat (limited to 'apps/files_encryption/templates/settings-personal.php')
0 files changed, 0 insertions, 0 deletions