1.4.1

danielroedl released this 26 Oct 17:39

· 9 commits to master since this release

41e10c1

Handle new internal code of merge conflicts issue 23
Add better error message if it's not possible to write temp file

Assets 2