Merge branch 'master' into dotnetcore

2017-02-14 11:18:24 +01:00 · 2017-02-14 11:18:24 +01:00 · 426be8592c
parent 3d9f07e5fe f0b865eea8
commit 426be8592c
1 changed files with 1 additions and 2 deletions
--- a/contributors.txt
+++ b/contributors.txt
@ -131,5 +131,4 @@ YYYY/MM/DD, github id, Full name, email
 2016/12/24, adrpo, Adrian Pop, adrian.pop@liu.se
 2017/01/13, marcelo-rocha, Marcelo Rocha, mcrocha@gmail.com
 2017/02/14, lecode-official, David Neumann, david.neumann@lecode.de
-2017/02/14, xied75, Dong Xie, xied75@gmail.com
-
+2017/02/14, xied75, Dong Xie, xied75@gmail.com