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

# Conflicts:
#   ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
This commit is contained in:
VegaZ
2019-03-10 10:49:51 +01:00
parent 5bf613bac4
commit 6feb19b8d3
15 changed files with 1332 additions and 86 deletions

View File

@@ -0,0 +1,12 @@
<html>
<head>
<link rel="stylesheet" href="package://assets/css/atm/style.css" />
<link rel="stylesheet" href="package://assets/css/jquery-ui.min.css" />
<meta charset="utf-8" />
</head>
<body>
<script type="text/javascript" src="package://assets/js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="package://assets/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="package://assets/js/login/script.js"></script>
</body>
</html>