From: lunnyxiao <xiaolunwen@gmail.com>
Date: Wed, 17 Sep 2014 04:04:18 +0000 (+0800)
Subject: Merge branch 'dev' of github.com:gogits/gogs into dev
X-Git-Tag: v0.9.99~1804
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=061a879cea39a1cce56dcb394b912fad50d7b77a;p=gitea.git

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

Conflicts:
	conf/app.ini
---

061a879cea39a1cce56dcb394b912fad50d7b77a
diff --cc conf/app.ini
index cb907b22de,c94afe0726..099e80525e
--- a/conf/app.ini
+++ b/conf/app.ini
@@@ -253,8 -253,5 +253,8 @@@ DRIVER 
  CONN =
  
  [i18n]
- LANGS = en-US,zh-CN,de-DE
- NAMES = English,简体中文,Deutsch
+ LANGS = en-US,zh-CN,de-DE,fr-CA
+ NAMES = English,简体中文,Deutsch,Français
 +
 +[git]
 +MAX_GITDIFF_LINES = 10000