Merge branch 'master' of github.com:com6056/proxstar

This commit is contained in:
Jordan Rodgers 2018-04-16 15:14:49 -04:00
commit be432989b5

View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta name="theme-color" content="#B0197E">
<link rel="shortcut icon" href="https://assets.csh.rit.edu/uploads/favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.0.0/dist/csh-material-bootstrap.min.css" media="screen">
<link rel="stylesheet" href="https://themeswitcher.csh.rit.edu/api/get" media="screen">
<link rel="stylesheet" href="/static/css/styles.css">
<link rel="stylesheet" href="/static/css/circle.css">
<link rel="manifest" href="/static/manifest.json">
@ -84,5 +84,4 @@
<script defer src="https://use.fontawesome.com/releases/v5.0.8/js/fontawesome.js" integrity="sha384-7ox8Q2yzO/uWircfojVuCQOZl+ZZBg2D2J5nkpLqzH1HY0C1dHlTKIbpRz/LG23c" crossorigin="anonymous"></script>
<script src="/static/js/script.js"></script>
</body>
</body>
</html>