Changeset [0e350c01cae911330a35b84af8058d966a24c7d0] by Thorsten Böttger
Revision 0e350c01cae911330a35b84af8058d966a24c7d0,
committed by Thorsten Böttger
· March 19th, 2016 @ 04:22 AM
Merge branch 'add_states_on_one_line' of https://github.com/HParker/aasm into HParker-add_states_on_one_line
Conflicts:
lib/aasm/base.rb
https://github.com/aasm/aasm/commit/0e350c01cae911330a35b84af8058d9...
5 changed files
-
A
spec/models/states_on_one_line_example.rb -
A
spec/unit/states_on_one_line_example_spec.rb -
M
README.md -
M
lib/aasm/base.rb -
M
spec/unit/readme_spec.rb