diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-10 16:54:48 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-10 16:54:48 +0200 |
| commit | cec932f29252da7d47ddcbb33003ba11252d5753 (patch) | |
| tree | 3c17c41b075f37b537c5851325940ab951ce2a52 /core/js/oc-dialogs.js | |
| parent | e17c40acb79a6848af0481d434ec7643c5c9bf03 (diff) | |
| parent | 72689f643b631061777149d96f6f170f7722e894 (diff) | |
| download | nextcloud-server-cec932f29252da7d47ddcbb33003ba11252d5753.tar.gz nextcloud-server-cec932f29252da7d47ddcbb33003ba11252d5753.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'core/js/oc-dialogs.js')
0 files changed, 0 insertions, 0 deletions