Thorsten Böttger 8f5778f13c Merge branch 'master' into multiple_state_machines_per_class ... Conflicts: lib/aasm/persistence/active_record_persistence.rb		2015-06-25 17:47:48 +12:00
..
aasm	Merge branch 'master' into multiple_state_machines_per_class	2015-06-25 17:47:48 +12:00
aasm.rb	bugfix: avoid Rails autoloading conflicts (see #137 and #139)	2014-11-28 22:22:43 +01:00