Merge branch 'release/v1.0' into develop
devel1
develop mod
feature
feature modified
change from repo 1
change from repo 2
change 2 from repo 1
change 2 from repo 2
conflict
conflict2
hotfix
Merge branch 'feature/rebasing' into develop
Merge branch 'hotfix/my-hotfix'
Merge branch 'hotfix/my-hotfix' into develop
uprava1
uprava2
upravy 1 + 2
Merge branch 'feature/teste' into develop
Commit from netbeans