Get development branch upto date #2

Merged
siwat merged 4 commits from master into develop 2019-08-19 09:31:25 +00:00
1 changed files with 6 additions and 1 deletions

View File

@ -1 +1,6 @@
# WaterishOS-Revision3.0x
<<<<<<< HEAD
# WaterishOS-Revision3.0x
=======
# WaterishOS-Revision2.0x
This is Waterish OS Revision 2 for Board v2 based on esp8266
>>>>>>> 4ea1442f6cc3a60cf380eb9710072af0624eefff