diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 18:43:55 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 18:43:55 +0000 |
| commit | 3b9e2f1babd578312377f846b2da4d30b550c37f (patch) | |
| tree | 6f965d04be8ac4a30f029c08aa7f147f1d0fb449 /apps/user_webdavauth | |
| parent | a528f96b842e387f153e4f38d87aebd26ccd39b7 (diff) | |
| parent | e6400b305987977d867f1592f3231167903b70b1 (diff) | |
| download | nextcloud-server-3b9e2f1babd578312377f846b2da4d30b550c37f.tar.gz nextcloud-server-3b9e2f1babd578312377f846b2da4d30b550c37f.zip | |
Merge branch 'master' into files_encryption-style-fixes
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
Diffstat (limited to 'apps/user_webdavauth')
0 files changed, 0 insertions, 0 deletions