diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-12-05 15:19:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 15:19:02 +0100 |
| commit | b1b4de32b8b646625a605d07e71b915828f1766c (patch) | |
| tree | 4d097e82bdfda93211334e70f488b0246d7f63e2 /apps/files/js/files.js | |
| parent | 8adf61772676bfe71e338fc1c009359135eb381e (diff) | |
| parent | af9b3e3889080e006e34406e18c142d38122d50d (diff) | |
| download | nextcloud-server-b1b4de32b8b646625a605d07e71b915828f1766c.tar.gz nextcloud-server-b1b4de32b8b646625a605d07e71b915828f1766c.zip | |
Merge pull request #2507 from nextcloud/conflict-dialog-ff
fix conflict dialog styling in firefox
Diffstat (limited to 'apps/files/js/files.js')
0 files changed, 0 insertions, 0 deletions