Skip to content
Snippets Groups Projects
Commit 31d45cd9 authored by Xiemuqing Xiao's avatar Xiemuqing Xiao
Browse files

Merge branch 'Xiemuqing-Xiao' into 'main'

Merge remote-tracking branch 'origin/28-registration-feature' into 28-registration-feature

See merge request !24
parents e2831246 bb1c5aaf
No related branches found
No related tags found
3 merge requests!48Resolve issue 70,!47Revert "Merge branch '26-as-a-user-i-want-to-see-the-rankings-of-each-member' into 'main'",!24Merge remote-tracking branch 'origin/28-registration-feature' into 28-registration-feature
......@@ -6,8 +6,8 @@
<title>User Login</title>
<!-- <link rel="stylesheet" href="/css/index.css">-->
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<!-- <script src="/js/bcrypt.min.js"></script>-->
<script src="https://cdn.bootcdn.net/ajax/libs/bcryptjs/2.4.3/bcrypt.min.js"></script>
<script src="/js/bcrypt.min.js"></script>
</head>
<body>
<h1>User Login</h1>
......
......@@ -6,8 +6,8 @@
<title>User Registration</title>
<link rel="stylesheet" href="/css/index.css">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<!-- <script src="/js/bcrypt.min.js"></script>-->
<script src="https://cdn.bootcdn.net/ajax/libs/bcryptjs/2.4.3/bcrypt.min.js"></script>
<script src="/js/bcrypt.min.js"></script>
</head>
<body>
<h1>User Register</h1>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment