diff options
| author | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
|---|---|---|
| committer | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
| commit | 061a879cea39a1cce56dcb394b912fad50d7b77a (patch) | |
| tree | 26e8c3d25da1b9d785421a6a02b7564798b2e8c4 /conf/app.ini | |
| parent | ed84adb679f3de70b2bffaead20a87711c38ee3a (diff) | |
| parent | 9f015b4c73806e65d3ca085b76723dc8cf41eb02 (diff) | |
| download | gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.tar.gz gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
conf/app.ini
Diffstat (limited to 'conf/app.ini')
| -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 cb907b22de..099e80525e 100644 --- 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
\ No newline at end of file |