Merge branch 'develop' into 'feature/atm-system'

# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
2019-04-02 18:50:17 +02:00
parent bed35f8f08
commit 63838e133a
20 changed files with 1226 additions and 42 deletions
--- a/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
+++ b/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
@@ -728,6 +728,8 @@ namespace ReallifeGamemode.Migrations

                    b.Property<int?>("FactionRankId");

+                    b.Property<int>("Handmoney");
+
                    b.Property<int>("LogUserId");

                    b.Property<string>("Name")