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

This commit is contained in:
skyblue 2014-03-23 23:45:08 +08:00
commit 3070c5513d
8 changed files with 5 additions and 9 deletions

View file

@ -105,8 +105,6 @@ SESSION_ID_HASHKEY =
[picture]
; The place to picture data, either "server" or "qiniu", default is "server"
SERVICE = server
; For "server" only, root path of picture data, default is "data/pictures"
PATH = data/pictures
[log]
; Either "console", "file", "conn", "smtp" or "database", default is "console"