From: Unknown <joe2010xtmf@163.com>
Date: Tue, 25 Mar 2014 10:54:22 +0000 (-0400)
Subject: Merge branch 'master' of github.com:gogits/gogs
X-Git-Tag: v0.9.99~2320^2~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5;p=gitea.git

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

Conflicts:
	conf/app.ini
---

e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5
diff --cc conf/app.ini
index 4c2398dd68,916079ed89..1a96ebeab6
--- a/conf/app.ini
+++ b/conf/app.ini
@@@ -1,8 -1,8 +1,8 @@@
  ; 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
 -; !!MUST CHANGE TO YOUR USER NAME!!
 -RUN_USER = skyblue
++; Change it if you run locally
 +RUN_USER = git
  ; Either "dev", "prod" or "test", default is "dev"
  RUN_MODE = dev