diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-12-19 14:34:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 14:34:56 +0100 |
| commit | 34fb313466b7d3c5be8b5c7d6846bfb4e6508013 (patch) | |
| tree | 4f1c769e35f1f0fa9239093817132c14052256a5 /COPYING-README | |
| parent | 9b71ee27ff95336c36d608217d9621110e6674c1 (diff) | |
| parent | c7fc010215f22aaff9380cb308f4794d7e2bba99 (diff) | |
| download | nextcloud-server-34fb313466b7d3c5be8b5c7d6846bfb4e6508013.tar.gz nextcloud-server-34fb313466b7d3c5be8b5c7d6846bfb4e6508013.zip | |
Merge pull request #2689 from andreas-p/fix-remote-conflict
Fix showConflict
Diffstat (limited to 'COPYING-README')
0 files changed, 0 insertions, 0 deletions