From 230eab09464cb5c4dcff9740ef888106de778220 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 29 Jan 2015 09:11:45 -0300 Subject: [PATCH] Fix merge with master --- app/models/article.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/article.rb b/app/models/article.rb index da909ba..b016150 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -9,7 +9,7 @@ class Article < ActiveRecord::Base :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link, - :image_builder, :show_to_followers + :image_builder, :show_to_followers, :published_at acts_as_having_image -- libgit2 0.21.2