Merge branch 'master' into dev
a
aaaa
tao trang tro giup - chua day du
#13
edit add device form
bgroundIcon, edit add form
;
send json web token
Pull dev, fixed #13
require device key on add
remove marker background
change host name
ignore config file
add ignore
ignore config file
ignore now really work
add mocha test to build system
summary page
report table
add stop pie chart