Merge branch 'release/v0.7.4'

vasinov · Dec 27, 2012 · 7146b9d · 7146b9d
2 parents 518222d + 4936421
commit 7146b9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    almanac (0.7.3)
+    almanac (0.7.4)
       acts-as-taggable-on (~> 2.3.1)
       bootstrap-rails-engine
       cancan

diff --git a/app/views/layouts/almanac/application.html.haml b/app/views/layouts/almanac/application.html.haml
@@ -3,7 +3,7 @@
   %head
     %title
       = (@blog) ? ((@blog.title) ? ((@post and @post.published) ? "#{@post.title} - #{@blog.title}" : @blog.title) : "Almanac Blog") : "Almanac Blog"
-    = auto_discovery_link_tag(:rss, "#{root_path}posts.rss")
+    = auto_discovery_link_tag(:rss, "#{root_path}feed.rss")
     = stylesheet_link_tag    "almanac/application", :media => "all"
     = javascript_include_tag "almanac/application"
     = csrf_meta_tags

diff --git a/lib/almanac/version.rb b/lib/almanac/version.rb
@@ -1,3 +1,3 @@
 module Almanac
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end