tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/charliexp/thingsboard 

# Conflicts:
#	ui/src/app/locale/locale.constant-zh.js
pull/874/head
charlie 8 years ago
parent
1960af7818 68ff23e2c5
commit
c79a213eb7
1 changed files with 1475 additions and 1407 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2882
      ui/src/app/locale/locale.constant-zh.js

2882
ui/src/app/locale/locale.constant-zh.js
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save