From: Michael Boke <michael@mbict.nl>
Date: Fri, 3 Oct 2014 20:51:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.9.99~1740^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ba1270df2d3d835b397317f133963e7b517242f1;p=gitea.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/app.ini
---

ba1270df2d3d835b397317f133963e7b517242f1
diff --cc conf/app.ini
index d2d121e06c,6c65fd2136..224f45dd62
--- a/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