diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
| commit | 27fcdb3af5d1b1012695a09e04c0a654a1dde710 (patch) | |
| tree | 6de492454c862852de3f51bd8834e2012139b5ac /3rdparty | |
| parent | 46e5e9bd73a68f7b50bb79f883a8bc6efacaca97 (diff) | |
| parent | 3584d48d65900b15dc3ef6831926f4a52e508625 (diff) | |
| download | nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.tar.gz nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.zip | |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to '3rdparty')
0 files changed, 0 insertions, 0 deletions