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

---
 src/assets/img/logo_100x40.png |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/img/logo_100x40.png b/src/assets/img/logo_100x40.png
index 4bd80ea..a1e8606 100644
--- a/src/assets/img/logo_100x40.png
+++ b/src/assets/img/logo_100x40.png
Binary files differ

--
Gitblit v1.8.0