felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity
1,980 Commits 9 Branches 685 Tags
b659da8a4b6fc09605473c70b39d0c250861b827
Commit Graph
1 Commits
Author SHA1 Message Date
Jakob Borg 47e64ae503 Handle conflicts when pulling (fixes #220) 2015-03-30 00:01:52 +02:00