diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-18 17:22:29 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-18 17:22:29 +0200 |
| commit | 7bd5e89f8cf6e46daa45e588d9275728b93a230e (patch) | |
| tree | db8885541d4db473d5dbc8df86520c2aea15153c /apps/files/js/files.js | |
| parent | 12ff268e607738b03125ec6b212708391496d7f5 (diff) | |
| download | nextcloud-server-7bd5e89f8cf6e46daa45e588d9275728b93a230e.tar.gz nextcloud-server-7bd5e89f8cf6e46daa45e588d9275728b93a230e.zip | |
simplify conflict template handling, fix reopen after ESC
Diffstat (limited to 'apps/files/js/files.js')
0 files changed, 0 insertions, 0 deletions