Merge branch 'dev' into master

2017-01-27 21:58:50 -06:00
parent 76750ab99a dbeaf452bd
commit 1a5f7507be
5 changed files with 698 additions and 3 deletions
--- a/http/index.html
+++ b/http/index.html
@@ -29,6 +29,7 @@
      <li><a href="node_info.lua">NodeMCU info</a>: Shows some basic NodeMCU(Lua)</li>
      <li><a href="file_list.lua">List all server files</a>: Displays a list of all the server files. (Lua)</li>
      <li><a href="foo.html">Foo</a>: A file that doesn't exist. Should error (404 error)</li>
+	  <li><a href="upload.html">Upload</a>: update, remove, list files on the server.</li>
   </ul>
 </body>
 </html>