1c6a6367e0
Conflicts: lib/aasm/persistence/active_record_persistence.rb |
||
---|---|---|
.. | ||
models | ||
unit | ||
database.yml | ||
en.yml | ||
en_deprecated_style.yml | ||
schema.rb | ||
spec_helper.rb |
1c6a6367e0
Conflicts: lib/aasm/persistence/active_record_persistence.rb |
||
---|---|---|
.. | ||
models | ||
unit | ||
database.yml | ||
en.yml | ||
en_deprecated_style.yml | ||
schema.rb | ||
spec_helper.rb |