From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 25 Mar 2014 10:27:56 +0000 (+0800)
Subject: Merge branch 'master' of localhost:xiaoxiao/gogs7
X-Git-Tag: v0.9.99~2338
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bb71a1bc1da52ce3985dfcb80852df5a9ca053d5;p=gitea.git

Merge branch 'master' of localhost:xiaoxiao/gogs7

Conflicts:
	.gitignore
---

bb71a1bc1da52ce3985dfcb80852df5a9ca053d5
diff --cc .gitignore
index a16d7156fc,6cd1df2b7a..eab518bb53
--- a/.gitignore
+++ b/.gitignore
@@@ -1,17 -1,3 +1,18 @@@
 +
++
 +gogs
 +*.exe
 +*.exe~
 +.DS_Store
 +*.db
 +*.log
 +custom/
 +data/
 +.vendor/
 +.idea/
 +*.iml
 +public/img/avatar/
 +
  # Compiled Object files, Static and Dynamic libs (Shared Objects)
  *.o
  *.a