diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 13:17:35 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 13:17:35 +0200 |
| commit | 7cfb0dc406910f66eaefc8651fd655a78883f241 (patch) | |
| tree | a8cda865f793d21f8248c5035c363ee3971fdd1a /core/templates/layout.user.php | |
| parent | 20ddd6e1c77224d18d5be74101b80144b7187475 (diff) | |
| parent | dd8011925acbd701de10e604b377c3d7f01aeff8 (diff) | |
| download | nextcloud-server-7cfb0dc406910f66eaefc8651fd655a78883f241.tar.gz nextcloud-server-7cfb0dc406910f66eaefc8651fd655a78883f241.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
Diffstat (limited to 'core/templates/layout.user.php')
0 files changed, 0 insertions, 0 deletions