Merge remote-tracking branch 'Gitlab-EA/develop' into develop

Khanh Nguyen · Khanh Nguyen · commit 8294c3ee79a6 · 2017-08-05T12:51:07.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+server-data/
+
 # Created by .ignore support plugin (hsz.mobi)
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+server-data/`
	`2`	`+`
`1`	`3`	`# Created by .ignore support plugin (hsz.mobi)`
`2`	`4`	`### JetBrains template`
`3`	`5`	`# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm`