Changeset [6bc99dcc39946d971d247a5e8bbad4980fe7835a] by Thorsten Böttger
Revision 6bc99dcc39946d971d247a5e8bbad4980fe7835a,
committed by Thorsten Böttger
· September 8th, 2011 @ 01:09 PM
Merge branch 'master' of https://github.com/wickkidd/aasm into wickkidd-master
Conflicts:
Rakefile
spec/spec_helper.rb
https://github.com/rubyist/aasm/commit/6bc99dcc39946d971d247a5e8bba...
8 changed files
-
M
aasm.gemspec -
M
lib/aasm/aasm.rb -
M
lib/aasm/event.rb -
M
lib/aasm/state_transition.rb -
M
spec/spec_helper.rb -
M
spec/unit/state_transition_spec.rb -
M
test/functional/auth_machine_test.rb -
M
test/test_helper.rb