John Wellbelove d2d3db1659 Merge remote-tracking branch 'origin/feature/delegates' into development
# Conflicts:
#	include/etl/type_traits.h
#	include/etl/type_traits_generator.h
#	test/test_type_traits.cpp
2019-05-19 23:16:24 +01:00
..
v15 Merge remote-tracking branch 'origin/feature/delegates' into development 2019-05-19 23:16:24 +01:00