Permalink
Browse files

Merge pull request #1807 from adrienkohlbecker/master

Fix #1805 conflict with Redcloth
  • Loading branch information...
pcreux committed Dec 11, 2012
2 parents 3a12436 + 685eaec commit 148160e4bcbb884a7692e20793ed998c858086fd
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/active_admin/views/footer.rb
@@ -10,7 +10,7 @@ def build
private
def powered_by_message
- para t('active_admin.powered_by',
+ para I18n.t('active_admin.powered_by',
:active_admin => link_to("Active Admin", "http://www.activeadmin.info"),
:version => ActiveAdmin::VERSION).html_safe
end

0 comments on commit 148160e

Please sign in to comment.