Merge branch 'master' of github.com:gogits/gogs
Conflicts: conf/app.ini
This commit is contained in:
commit
e95be2cb3e
52 changed files with 424 additions and 263 deletions
|
@ -1,7 +1,7 @@
|
|||
; App name that shows on every page title
|
||||
APP_NAME = Gogs: Go Git Service
|
||||
APP_LOGO = img/favicon.png
|
||||
; Check it if you run locally
|
||||
; Change it if you run locally
|
||||
RUN_USER = git
|
||||
; Either "dev", "prod" or "test", default is "dev"
|
||||
RUN_MODE = dev
|
||||
|
@ -164,4 +164,4 @@ RECEIVERS =
|
|||
[log.database]
|
||||
LEVEL =
|
||||
Driver =
|
||||
CONN =
|
||||
CONN =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue