Merge commit '6d8c73'

This commit is contained in:
Tom Preston-Werner 2008-12-21 17:56:08 -08:00
commit bd1e5a6095
1 changed files with 2 additions and 2 deletions

View File

@ -145,11 +145,11 @@ module Jekyll
# #
# Returns <Hash> # Returns <Hash>
def to_liquid def to_liquid
{ "title" => self.data["title"] || "", self.data.merge({ "title" => self.data["title"] || "",
"url" => self.url, "url" => self.url,
"date" => self.date, "date" => self.date,
"id" => self.id, "id" => self.id,
"content" => self.content } "content" => self.content })
end end
end end