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

---
 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 22ea4c3..dbb8954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,6 @@
 Thumbs.db
 .angulardoc.json
 yarn.lock
+/_nginx/*
+.github/*
 

--
Gitblit v1.8.0