Changeset [56af04d5f01371cd6f3af49c763a92e4d371285b] by Travis Tilley
Revision 56af04d5f01371cd6f3af49c763a92e4d371285b,
committed by Travis Tilley
· May 27th, 2009 @ 07:55 PM
Merge branch 'joaovitor/master'
Conflicts:
spec/functional/conversation_spec.rb
11 changed files
-
M
aasm.gemspec -
M
lib/aasm.rb -
M
lib/event.rb -
M
lib/persistence.rb -
M
lib/state_machine.rb -
M
lib/state_transition.rb -
M
spec/functional/conversation_spec.rb -
M
spec/unit/aasm_spec.rb -
M
spec/unit/event_spec.rb -
M
spec/unit/state_spec.rb -
M
spec/unit/state_transition_spec.rb