2 Commits

Author SHA1 Message Date
John Wellbelove
efd52cf4b6 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
#	src/array_wrapper.h
#	src/container.h
#	src/platform.h
#	test/test_array_wrapper.cpp
#	test/vs2017/etl.vcxproj.filters
2018-01-23 12:23:35 +00:00
John Wellbelove
8607294405 Merge remote-tracking branch 'origin/development' 2018-01-21 20:39:28 +00:00