diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-29 09:21:00 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-29 09:21:00 +0200 |
| commit | c398fc59ad870751cee73a2fbef8bc75233a7515 (patch) | |
| tree | f686bab6d58a62fefd231b8132b5efa0001ba0ec /core/js/jquery.ocdialog.js | |
| parent | 09b54ccb2b01c558b1d9ccad1e335492d97b4fe1 (diff) | |
| parent | 7c0c6bd779cb73c4fdc9993f6dc78f9dd1138a88 (diff) | |
| download | nextcloud-server-c398fc59ad870751cee73a2fbef8bc75233a7515.tar.gz nextcloud-server-c398fc59ad870751cee73a2fbef8bc75233a7515.zip | |
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
Diffstat (limited to 'core/js/jquery.ocdialog.js')
0 files changed, 0 insertions, 0 deletions