Closed syvlabs closed 5 years ago
Merge branch 'master' into feature/integrate-imatch
for future reference, i would advise against merging master into your feature branch and instead rebasing the branch on master
Branch currently has conflicts with master. Will fix these first on the rebased-integrate-imatch
branch then reset this PR to the result.
Fixes #299 #300