From 44e258acff991838ad7f10276556b596b6b0b25b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 16:03:34 +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 6a6ad18..e0badcd 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