diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-06-02 09:36:51 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-06-02 09:36:51 +0200 |
| commit | d2f3710ede1fa72658a4c12264a90a1936faf9ca (patch) | |
| tree | 1a1593b02c9af77986d3a1ea8d6ada1853158de1 /.idea | |
| parent | cf2c599218f01c1351cee2e4e48ee4b430f55287 (diff) | |
| parent | f05ac47eb65c1bb418d89636c660093c79e4bef5 (diff) | |
| download | nextcloud-server-d2f3710ede1fa72658a4c12264a90a1936faf9ca.tar.gz nextcloud-server-d2f3710ede1fa72658a4c12264a90a1936faf9ca.zip | |
Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
Get a 96x96 preview for file conflict resolution
Diffstat (limited to '.idea')
0 files changed, 0 insertions, 0 deletions