From e86e4f95fcca349107237f8f4161b9c91e279af1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 11:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' 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