Changeset [ec0002abd313cefd4a8b49d2fa898aed382eabcb] by Thorsten Böttger
Revision ec0002abd313cefd4a8b49d2fa898aed382eabcb,
committed by Thorsten Böttger
· November 30th, 2013 @ 08:30 AM
Merge branch 'master' into aasm4
Conflicts:
CHANGELOG.md
https://github.com/aasm/aasm/commit/ec0002abd313cefd4a8b49d2fa898ae...
10 changed files
-
A
gemfiles/rails_3.2.gemfile -
A
gemfiles/rails_4.0.gemfile -
M
.travis.yml -
M
CHANGELOG.md -
M
Gemfile -
M
README.md -
M
aasm.gemspec -
M
lib/aasm/version.rb -
M
spec/unit/persistence/mongoid_persistance_spec.rb -
M
spec/unit/transition_spec.rb