projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 697178b) | patch
Doc: For conflicts, the local file is renamed #5521
authorChristian Kamm <mail@ckamm.de>
Fri, 10 Feb 2017 11:50:35 +0000 (12:50 +0100)
committerChristian Kamm <mail@ckamm.de>
Fri, 10 Feb 2017 11:50:35 +0000 (12:50 +0100)
commit006ce854a613e2017f3c724ef2f58570b9012e56
tree575fec19e24afac6d9b7ad9767101ee08fad27f1tree | snapshot
parent697178bab6198071148b99e275b1fa857b07d37acommit | diff
Doc: For conflicts, the local file is renamed #5521
doc/architecture.rst diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.