2 Commits

Author SHA1 Message Date
John Wellbelove
2dfff5b5c2 Merge remote-tracking branch 'origin/master' into feature/add_circle-ci_support
# Conflicts:
#	include/etl/cstring.h
#	include/etl/u16string.h
#	include/etl/u32string.h
#	include/etl/wstring.h
2019-12-06 13:50:56 +00:00
John Wellbelove
4dd0cf2447 Merge remote-tracking branch 'origin/feature/etl__make_string' into development
# Conflicts:
#	include/etl/version.h
#	library.json
#	library.properties
#	support/Release notes.txt
2019-12-04 20:55:51 +00:00