Get development branch upto date #2

Merged
siwat merged 4 commits from master into develop 2019-08-19 09:31:25 +00:00

4 commits

Author SHA1 Message Date
7af03fc6d9 Fixed merge conflict 2019-08-19 09:30:59 +00:00
4ea1442f6c Update README.md 2019-08-19 01:18:04 +00:00
eab56bd19c Merge pull request #1 in WAT/waterishos-revision2.0x from develop to master
* commit 'c223b7ddd2':
  create v3 release file
  Update WaterishOS-core2.0.ino
2019-08-18 12:28:40 +00:00
ff5b9c66bf Update WaterishOS-core2.0.ino 2019-08-12 21:43:37 +07:00