Merge branch 'master' into Develop

# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
This commit is contained in:
Ozzieisaacs
2019-02-16 10:17:46 +01:00
14 changed files with 282 additions and 435 deletions
+2
View File
@@ -7,6 +7,8 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">