Merge branch 'master' of localhost:xiaoxiao/gogs7

Conflicts:
	.gitignore

diff --cc .gitignore
index a16d7156fcad55fdf009dae81a7271bc3f2e30af,6cd1df2b7a3b5cd99e60d82ef18f486a3ef8d922..eab518bb53f83611271c43420c4ebdeabfa6f203
--- 1/.gitignore
--- 2/.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