paper-trail-gem--paper_trail/lib
Ben Atkins 3c775aa6b3 Merge branch 'rails4'
Conflicts:
	README.md
	lib/paper_trail/has_paper_trail.rb
	lib/paper_trail/version.rb
	test/dummy/config/initializers/paper_trail.rb
	test/unit/model_test.rb
	test/unit/version_test.rb
2013-08-01 14:57:44 -04:00
..
generators/paper_trail Fixes the migration generators 2013-02-04 16:31:05 -08:00
paper_trail Merge branch 'rails4' 2013-08-01 14:57:44 -04:00
paper_trail.rb Merge remote-tracking branch 'SeanMarcia/master' into cleaner 2013-07-30 15:14:50 -04:00