diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 10:31:43 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 10:31:43 +0200 |
| commit | 03ddf8da8023b1f77559ac460c43df8d15e7afe5 (patch) | |
| tree | f186fb9d7dd2bf2a653fcf7ce04f3069806bd804 /core/js/oc-dialogs.js | |
| parent | bbf8acb383bdcb1dcb53f4b9d5a8d894b17401df (diff) | |
| parent | fbedd643f7763531fbc8d671e259b82d8525e782 (diff) | |
| download | nextcloud-server-03ddf8da8023b1f77559ac460c43df8d15e7afe5.tar.gz nextcloud-server-03ddf8da8023b1f77559ac460c43df8d15e7afe5.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