7d32335b60
Conflicts: CHANGELOG.md lib/aasm/event.rb lib/aasm/transition.rb |
||
---|---|---|
.. | ||
models | ||
unit | ||
database.rb | ||
database.yml | ||
en.yml | ||
en_deprecated_style.yml | ||
spec_helper.rb |
7d32335b60
Conflicts: CHANGELOG.md lib/aasm/event.rb lib/aasm/transition.rb |
||
---|---|---|
.. | ||
models | ||
unit | ||
database.rb | ||
database.yml | ||
en.yml | ||
en_deprecated_style.yml | ||
spec_helper.rb |