Changeset [30745dc5f5f041d30b8a8e432730042f0363f2d8] by Thorsten Böttger
Revision 30745dc5f5f041d30b8a8e432730042f0363f2d8,
committed by Thorsten Böttger
· September 12th, 2014 @ 08:34 AM
Merge branch 'aasm4_squash_merging_stiff_master' into merging-stiff-master
Conflicts:
lib/aasm/transition.rb spec/unit/transition_spec.rb
https://github.com/aasm/aasm/commit/30745dc5f5f041d30b8a8e432730042...
11 changed files
-
M
CHANGELOG.md -
M
README.md -
M
README_FROM_VERSION_3_TO_4.md -
M
lib/aasm/base.rb -
M
lib/aasm/instance_base.rb -
M
lib/aasm/transition.rb -
M
lib/aasm/version.rb -
M
spec/models/callback_new_dsl.rb -
M
spec/models/double_definer.rb -
M
spec/unit/event_spec.rb -
M
spec/unit/transition_spec.rb