1 Commits

Author SHA1 Message Date
John Wellbelove
ede3a19edd Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters
2018-09-08 15:57:37 +01:00