John Wellbelove d9f79715e4 Merge remote-tracking branch 'origin/feature/delegates' into development ... # Conflicts: # include/etl/delegate.h # include/etl/version.h # support/Release notes.txt # test/test_delegate.cpp		2019-05-22 20:18:11 +01:00
..
.gitignore	Merge remote-tracking branch 'origin/feature/delegates' into development	2019-05-22 20:18:11 +01:00