From fa669c21647e53946af0e9b768dcab65742eb039 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 27 Mar 2018 10:31:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/assets/i18n/zh-CN.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 255f31a..6a6ad18 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -6,7 +6,7 @@
     "logout": "������",
     "more": "������",
     "full": "������",
-    "top-search-ph": "������������������������������������",
+    "top-search-ph": "���������������������������������������",
     "theme": "������",
     "theme-switch": "������������",
     "light": "���",

--
Gitblit v1.8.0