Changeset [8f5778f13c7ad4eae9c2ee0f385e9214c501f389] by Thorsten Böttger
Revision 8f5778f13c7ad4eae9c2ee0f385e9214c501f389,
committed by Thorsten Böttger
· June 25th, 2015 @ 01:47 AM
Merge branch 'master' into multiple_state_machines_per_class
Conflicts:
lib/aasm/persistence/active_record_persistence.rb
https://github.com/aasm/aasm/commit/8f5778f13c7ad4eae9c2ee0f385e921...
9 changed files
-
A
CODE_OF_CONDUCT.md -
M
CHANGELOG.md -
M
README.md -
M
lib/aasm/base.rb -
M
lib/aasm/persistence/active_record_persistence.rb -
M
lib/aasm/version.rb -
M
spec/models/active_record/localizer_test_model.rb -
M
spec/models/validator.rb -
M
spec/unit/persistence/active_record_persistence_spec.rb