Merge branch 'master' into 'master'

# Conflicts: # version/Version.go
2018-09-15 14:29:25 +00:00 · 2018-09-15 14:29:25 +00:00 · 830bd66862
commit 830bd66862
parent f90555c439 e3694e56c8
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+.idea/** merge=ignore