Merge branch 'master' into optional-google-fonts

This commit is contained in:
Riley Davis
2017-04-07 10:42:20 -06:00
61 changed files with 974 additions and 151 deletions
+1
View File
@@ -4,6 +4,7 @@
<meta property="csrf" content="<%= csrfToken %>">
<link rel="stylesheet" type="text/css" href="/client/embed/stream/default.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
<% if (locals.customCssUrl) { %>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<% } %>