Merge branch 'develop' of github.com:gogits/gogs into develop

This commit is contained in:
Unknwon 2015-04-24 05:21:10 -04:00
commit c08baee085
21 changed files with 203 additions and 38 deletions

View file

@ -619,6 +619,7 @@ auths.smtp_auth = SMTP Authorization Type
auths.smtphost = SMTP Host
auths.smtpport = SMTP Port
auths.enable_tls = Enable TLS Encryption
auths.pam_service_name = PAM Service Name
auths.enable_auto_register = Enable Auto Registration
auths.tips = Tips
auths.edit = Edit Authorization Setting