Merge branch 'FlashString'

kezorm · kezorm · commit 9a0923032a8f · 2018-11-04T16:31:59.000-06:00
# Conflicts:
#	api/String.h
diff --git a/api/String.h b/api/String.h
@@ -25,7 +25,6 @@
 
 #include "Printable.h"
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
