Changeset [f5d20129b34e4138b63699cae688046ed8c2010c] by Thorsten Böttger
Revision f5d20129b34e4138b63699cae688046ed8c2010c,
committed by Thorsten Böttger
· January 11th, 2014 @ 07:05 AM
Merge branch 'master' of https://github.com/ivantsepp/aasm into ivantsepp-master
Conflicts:
lib/aasm/persistence/active_record_persistence.rb
https://github.com/aasm/aasm/commit/f5d20129b34e4138b63699cae688046...
2 changed files
-
M
lib/aasm/persistence/active_record_persistence.rb -
M
spec/unit/persistence/active_record_persistence_spec.rb