Permalink
Browse files

Merge branch 'master' of https://github.com/jorgeramos/rails_admin in…

…to paper-trail-changeset

Conflicts:
	lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
  • Loading branch information...
2 parents a893cb5 + 7275ebd commit 734b9ca7daf5b0861248035e01ffa20f7ef11b3f @jorgeramos jorgeramos committed Sep 30, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/views/rails_admin/main/history.html.haml
@@ -34,7 +34,7 @@
%td= object.username
- if @general
%td= object.item
- %td= object.message
+ %td= object.changes
- unless params[:all] || !@history.respond_to?(:current_page)
= paginate(@history, :theme => 'twitter-bootstrap', :remote => true)

0 comments on commit 734b9ca

Please sign in to comment.