Added merge feature

mapaiva released this 20 Jan 17:06

· 111 commits to master since this release

8f1c6af

Many fixes in the application
Created merge feature
Better Gettings Started UX
Added basic support to mergetools

Assets 7