Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/app.ini

conf/app.ini

@@ -1,6 +1,5 @@
 ; App name that shows on every page title
 APP_NAME = Gogs: Go Git Service
-APP_LOGO = img/favicon.png
 ; Change it if you run locally
 RUN_USER = git
 ; Either "dev", "prod" or "test", default is "dev"
@@ -22,14 +21,14 @@ OFFLINE_MODE = false
 DISABLE_ROUTER_LOG = false
 ; Generate steps:
 ; $ cd path/to/gogs/custom/https
-; $ go run $GOROOT/src/pkg/crypto/tls/generate_cert.go -ca=true -duration=8760h0m0s -host=myhost.example.com
+; $ ./gogs cert -ca=true -duration=8760h0m0s -host=myhost.example.com
 CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
 ; Upper level of template and static file path
 ; default is the path where Gogs is executed
 STATIC_ROOT_PATH =
 ; Application level GZIP support
-ENABLE_GZIP = false
+#ENABLE_GZIP = false
 
 [database]
 ; Either "mysql", "postgres" or "sqlite3", it's your choice
@@ -253,6 +252,9 @@ DRIVER =
 ; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8
 CONN =
 
+[git]
+MAX_GITDIFF_LINES = 10000
+
 [i18n]
-LANGS = en-US,zh-CN,de-DE,nl-NL
-NAMES = English,简体中文,Deutsch,Nederlands
+LANGS = en-US,zh-CN,de-DE,fr-CA,nl-NL
+NAMES = English,简体中文,Deutsch,Français,Nederlands