Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

2021-04-07 22:43:11 +02:00
parent 56ab0734ee a070f7b74a
commit 79ab18b65b
4 changed files with 4 additions and 4 deletions
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -21,7 +21,7 @@ using ReallifeGamemode.Server.WeaponDeal;

 /**
 * @overview Life of German Reallife - Event Key (Key.cs)
-* @author VegaZ
+* @author VegaZ, balbo
 * @copyright (c) 2008 - 2018 Life of German
 */

--- a/ReallifeGamemode.Server/Events/Register.cs
+++ b/ReallifeGamemode.Server/Events/Register.cs
@@ -6,7 +6,7 @@ using ReallifeGamemode.Database.Models;

 /**
 * @overview Life of German Reallife - Event Register (Register.cs)
-* @author VegaZ
+* @author VegaZ, balbo
 * @copyright (c) 2008 - 2018 Life of German
 */

--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -19,7 +19,7 @@ using ReallifeGamemode.Server.Factions.Medic;

 /**
 * @overview Life of German Reallife - Managers Interaction (InteractionManager.cs)
-* @author VegaZ
+* @author VegaZ, balbo
 * @copyright (c) 2008 - 2018 Life of German
 */

--- a/ReallifeGamemode.Server/Managers/InventoryManager.cs
+++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs
@@ -18,7 +18,7 @@ using ReallifeGamemode.Server.Types;

 /**
 * @overview Life of German Reallife - Managers InventoryManager (InventoryManager.cs)
-* @author hydrant, VegaZ
+* @author hydrant, VegaZ, balbo
 * @copyright (c) 2008 - 2018 Life of German
 */