Changeset [486a04501601435e080684d8a4412709f69934b1] by Thorsten Böttger
Revision 486a04501601435e080684d8a4412709f69934b1,
committed by Thorsten Böttger
· January 11th, 2014 @ 06:56 AM
Merge branch 'master' into aasm4
Conflicts:
CHANGELOG.md
https://github.com/aasm/aasm/commit/486a04501601435e080684d8a441270...
16 changed files
-
A
gemfiles/rails_4.1.gemfile -
A
spec/database.rb -
R
spec/schema.rb -
M
.gitignore -
M
.travis.yml -
M
CHANGELOG.md -
M
gemfiles/rails_3.2.gemfile -
M
gemfiles/rails_4.0.gemfile -
M
lib/aasm/persistence/active_record_persistence.rb -
M
lib/aasm/persistence/mongoid_persistence.rb -
M
lib/aasm/state.rb -
M
lib/aasm/version.rb -
M
spec/spec_helper.rb -
M
spec/unit/localizer_spec.rb -
M
spec/unit/persistence/active_record_persistence_spec.rb -
M
spec/unit/persistence/mongoid_persistance_spec.rb