John Wellbelove 9206209392 Merge branch 'development' into feature/add_circle-ci_support ... # Conflicts: # include/etl/version.h # library.json # library.properties # support/Release notes.txt # test/test_make_string.cpp # test/test_string_char.cpp # test/vs2017/etl.vcxproj.filters		2020-05-12 12:34:06 +01:00
..
etl	Merge branch 'development' into feature/add_circle-ci_support	2020-05-12 12:34:06 +01:00