Merge branch 'develop' into 'feature/atm-system'
# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
This commit is contained in:
12
ReallifeGamemode.Client/assets/html/atm/index.html
Normal file
12
ReallifeGamemode.Client/assets/html/atm/index.html
Normal 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>
|
||||
Reference in New Issue
Block a user