Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/app.ini

diff --cc conf/app.ini
index d2d121e06c4d74ea46f3e2fb606340c5445c2eb2,6c65fd21364deb07c957a1209883dcba42af94c7..224f45dd621e77628d09995946c94923e4eef8eb
--- 1/conf/app.ini
--- 2/conf/app.ini
+++ b/conf/app.ini
@@@ -253,6 -252,9 +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
 -NAMES = English,简体中文,Deutsch,Français
++LANGS = en-US,zh-CN,de-DE,fr-CA,nl-NL
++NAMES = English,简体中文,Deutsch,Français,Nederlands