Merge "Rename Translations menu to Language"

author Felix Dörre <felix@dogcraft.de>

Wed, 15 Jun 2016 08:52:17 +0000 (10:52 +0200)

committer Gerrit Code Review <gigi-system@dogcraft.de>

Wed, 15 Jun 2016 08:52:17 +0000 (10:52 +0200)
author Felix Dörre <felix@dogcraft.de>
Wed, 15 Jun 2016 08:52:17 +0000 (10:52 +0200)
committer Gerrit Code Review <gigi-system@dogcraft.de>
Wed, 15 Jun 2016 08:52:17 +0000 (10:52 +0200)
diff --git a/.gitattributes b/.gitattributes

index 9535ab16027f42b756787a403ba26f895630831b..10c31b96b067369f4553016c70f621fbb2877bde 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
  *      text=auto
  
-*.java text
+*.java text diff=java
  
  *.txt  text
  *.md   text
author	Felix Dörre <felix@dogcraft.de>
	Wed, 15 Jun 2016 08:52:17 +0000 (10:52 +0200)
committer	Gerrit Code Review <gigi-system@dogcraft.de>
	Wed, 15 Jun 2016 08:52:17 +0000 (10:52 +0200)