web/view/device · 6400de30ff3012c518d6642369bda32c854925f8 · 朱建香 / DoorLock

Merge remote-tracking branch 'remotes/origin/wangying' into zjx · 15b516a2

# Conflicts:
#	dev/src/lang/zh.json
#	web/lib/less/device/notify.less
#	web/lib/less/doorlockUsers/doorlockUser.less
#	web/view/device/index.html
#	web/view/device/notify.css
#	web/view/device/notify.html
#	web/view/doorlockUsers/doorlockUser.css
#	web/view/doorlockUsers/inviteBind.html

committed Jan 12, 2018

15b516a2

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...
notify.css		Loading commit data...
notify.html		Loading commit data...
opendoorRecord.html		Loading commit data...
recordList.css		Loading commit data...
remoteOpendoor.html		Loading commit data...