Ben Atkins ff2ac31485 Merge remote-tracking branch 'TylerRick/use_serialized_value_for_object_changes' ... Conflicts: lib/paper_trail/has_paper_trail.rb		2012-12-17 15:40:15 -05:00
..
migrate	Merge remote-tracking branch 'TylerRick/use_serialized_value_for_object_changes'	2012-12-17 15:40:15 -05:00
schema.rb	Setting up appropriate objects in the dummy app for testing	2011-03-24 13:29:44 -06:00