diff options
author | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:54:22 -0400 |
---|---|---|
committer | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:54:22 -0400 |
commit | e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5 (patch) | |
tree | 746b1ab1ab5626fb20ddd04121c29a951a6f84b3 /conf | |
parent | eeb793524f2da4afdca017b585d9cfb6e9628e85 (diff) | |
parent | 94ac5ebb9f100c77da02b56961119a25cd9e6d20 (diff) | |
download | gitea-e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5.tar.gz gitea-e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5.zip |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
conf/app.ini
Diffstat (limited to 'conf')
-rw-r--r-- | conf/app.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini index 4c2398dd68..1a96ebeab6 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -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 =
\ No newline at end of file +CONN = |