web/view/device · 31c77ca38bb4550be5bba405d11c6f0d3535b1c9 · felix / DoorLock

Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx · 31c77ca3

# Conflicts:
#	History.md
#	web/lib/js/p.js
#	web/lib/less/addDevice/addDevice.less
#	web/lib/less/device/device.less
#	web/lib/less/public/animation.less
#	web/lib/less/public/core.less
#	web/lib/less/public/public.less
#	web/resources/font/iconfont.ttf
#	web/resources/lang/zh.json
#	web/view/addDevice/addDevice.css
#	web/view/device/device.css

committed Sep 26, 2017

31c77ca3

Name	Last commit	Last update
..
alarmInfo.html		Loading commit data...
device.css		Loading commit data...
hijackRecord.html		Loading commit data...
index.html		Loading commit data...
opendoorRecord.html		Loading commit data...
recordList.css		Loading commit data...
remoteOpendoor.html		Loading commit data...