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

Conflicts: conf/app.ini
2014-09-17 12:04:18 +08:00
parent ed84adb679 9f015b4c73
commit 061a879cea
20 changed files with 659 additions and 48 deletions
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -253,8 +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