diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-28 11:00:49 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-28 11:00:49 +0200 |
| commit | 09b54ccb2b01c558b1d9ccad1e335492d97b4fe1 (patch) | |
| tree | 5962c534191376de8457e7d1a345e52210794d26 /apps/files_encryption/hooks | |
| parent | 3a76c22372654bacb5c33a927779be06baca616e (diff) | |
| parent | 086c33ef57ddddcad84e9cb21c9e24b5a4c43a5d (diff) | |
| download | nextcloud-server-09b54ccb2b01c558b1d9ccad1e335492d97b4fe1.tar.gz nextcloud-server-09b54ccb2b01c558b1d9ccad1e335492d97b4fe1.zip | |
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
Diffstat (limited to 'apps/files_encryption/hooks')
0 files changed, 0 insertions, 0 deletions