Sebastian Stenzel 1c54e4f4ad in the unlikely event of an alternative name already being used, choose a new random conflict id. il y a 9 ans
..
main 1c54e4f4ad in the unlikely event of an alternative name already being used, choose a new random conflict id. il y a 9 ans
test 9fd6f2ecae transparently show sync conflicts (fixes #98) il y a 9 ans