Merge remote branch 'origin/samual/update_credits'

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 669c1ab9cb5b62cbd4718301678ee6a3433b7f51..5c48a627fcc8cf9236befc389507fcb2f5ac9873 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -4,6 +4,7 @@ Rudolf "divVerent" Polzer
 Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
+Samual "Ares" Lenks
 mand1nga
 Jakob "tZork" Markström Gröhn
 
@@ -109,7 +110,6 @@ chooksta
 cortez
 Cuinn "Cuinnton" Herrick
 Florian Paul "lda17h" Schmidt
-Florian Paul Schmidt
 kojn
 Kristian "morfar" Johansson
 kuniuthefrogg
@@ -123,7 +123,6 @@ Paul Scott
 PlasmaSheep
 Przemysław "atheros" Grzywacz
 Ruszkai "C.Brutail" Ákos
-Samual Lenks
 Sc0rp
 Severin "sev" Meyer
 SoulKeeper_p