Merge branch 'master' of github.com:shxsun/gogs

2014-03-24 23:08:58 +08:00
parent 3070c5513d 8376b0d53c
commit 6e972afb15
27 changed files with 254 additions and 140 deletions
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -52,6 +52,8 @@ DISENABLE_REGISTERATION = false
 REQUIRE_SIGNIN_VIEW = false
 ; Cache avatar as picture
 ENABLE_CACHE_AVATAR = false
+; Mail notification
+ENABLE_NOTIFY_MAIL = false

 [mailer]
 ENABLED = false