Merge pull request #19 from springhackathon/v0.1.1

V0.1.1 :smiley_cat:
DreamHackers · Sep 12, 2015 · 6a4780a · 6a4780a
2 parents 5a1c2c9 + e9a02a6
commit 6a4780a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
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
@@ -5,6 +5,7 @@
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
+  <%= favicon_link_tag %>
 </head>
 <body class="main_application">
   <div class="main_div">