Changeset [3ce4119cb688a9b255f7bec323c86c8eb99661bb] by Thorsten Böttger
Revision 3ce4119cb688a9b255f7bec323c86c8eb99661bb,
committed by Thorsten Böttger
· November 18th, 2013 @ 05:05 PM
Merge branch 'master' of https://github.com/ejlangev/aasm into ejlangev-master
Conflicts:
lib/aasm/aasm.rb
https://github.com/aasm/aasm/commit/3ce4119cb688a9b255f7bec323c86c8...
4 changed files
-
M
lib/aasm/aasm.rb -
M
lib/aasm/event.rb -
M
spec/models/callback_new_dsl.rb -
M
spec/unit/callbacks_spec.rb