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

# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
2019-03-10 10:49:51 +01:00
parent 5bf613bac4
commit 6feb19b8d3
15 changed files with 1332 additions and 86 deletions
--- a/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj
+++ b/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj
@@ -13,6 +13,8 @@
  </PropertyGroup>

  <ItemGroup>
+    <Folder Include="assets\css\atm\" />
+    <Folder Include="assets\img\atm\" />
    <Folder Include="cs_packages\" />
    <Folder Include="Gui\vehiclemenu\web\css\" />
    <Folder Include="Gui\vehiclemenu\web\font\" />