Sebastian Stenzel a15acd64c8 set version to 1.2.0 8 rokov pred
..
src 034a667e07 Fixed problem with sync conflict resolver. Issue #311 8 rokov pred
.gitignore b22ac719f2 renamed filesystem layer maven modules 9 rokov pred
pom.xml a15acd64c8 set version to 1.2.0 8 rokov pred