Version 1.36

2020-01-28

Improvements

  • Automatically resolve merge conflicts

  • New combined editor / viewer - #33

  • Allow Notes to be moved to another Folder - #37