Changeset [6f9be8628219ddd8667ca03b2e045ad91f2b8c97] by Thorsten Böttger
Revision 6f9be8628219ddd8667ca03b2e045ad91f2b8c97,
committed by Thorsten Böttger
· February 21st, 2013 @ 03:35 PM
Merge branch 'stiff-master' into master_merge_stiff
Conflicts:
README.md lib/aasm/supporting_classes/event.rb
https://github.com/aasm/aasm/commit/6f9be8628219ddd8667ca03b2e045ad...
4 changed files
-
M
README.md -
M
lib/aasm/aasm.rb -
M
lib/aasm/supporting_classes/event.rb -
M
spec/unit/supporting_classes/event_spec.rb