Skip to content

M
Moecube Accounts Web
Commit 7ceb460f authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/models/auth.js
#	src/routes/Index.js
parent fc3eb755
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
public/index.html
View file @ 7ceb460f
......@@ -3,7 +3,8 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="index.css" />
<link rel="stylesheet" href="index.css"/>
<link rel="icon" href="https://moecube.com/favicon.ico">
</head>
<body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment