dev/src/lang · b09d38d7a8daf5bf738c4bbf128030d219acdc0d · felix / DoorLock · GitLab

History Find file

Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into wangying · b09d38d7
```
# Conflicts:
#	web/lib/less/device/device.less
#	web/lib/less/myInfo/help.less
#	web/view/myInfo/help.css
```
wangying committed Jan 05, 2018
b09d38d7

Name	Last commit	Last update
..
en.json		Loading commit data...
zh.json		Loading commit data...