diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-02 12:15:44 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-02 12:15:44 +0200 |
| commit | 3564a837d88e7a5741b4b5727d993b34c6d841e9 (patch) | |
| tree | eedd86f2191825f440faeb35f94971647949e6a0 /apps/files_trashbin | |
| parent | d0f6bfe7b6bca148d0a8ee551fe9b28951ce5d55 (diff) | |
| parent | 5dff9d88cb58c9c533a113d6cbde9d5b6acd1c92 (diff) | |
| download | nextcloud-server-3564a837d88e7a5741b4b5727d993b34c6d841e9.tar.gz nextcloud-server-3564a837d88e7a5741b4b5727d993b34c6d841e9.zip | |
Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise
Make sure the conflict dialog is loaded before adding conflicts
Diffstat (limited to 'apps/files_trashbin')
0 files changed, 0 insertions, 0 deletions