Merge

hpi-swt2 · Jan 19, 2018 · 06f9595 · 06f9595
2 parents cbb6a42 + 1e22f75
commit 06f9595
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-
+    <%= favicon_link_tag %>
     <title><%= t('appname') %></title>
     <%= csrf_meta_tags %>
 

diff --git a/public/favicon.ico b/public/favicon.ico