Changeset [71340725686ee3f9cf61e152bde92b95d056c225] by Reid Morrison
Revision 71340725686ee3f9cf61e152bde92b95d056c225,
committed by Reid Morrison
· February 14th, 2015 @ 01:06 PM
Merge branch 'master' of https://github.com/aasm/aasm
Conflicts:
Gemfile gemfiles/rails_4.0.gemfile gemfiles/rails_4.1.gemfile
gemfiles/rails_4.2.gemfile
https://github.com/aasm/aasm/commit/71340725686ee3f9cf61e152bde92b9...
8 changed files
-
M
Gemfile -
M
gemfiles/rails_4.0.gemfile -
M
gemfiles/rails_4.1.gemfile -
M
gemfiles/rails_4.2.gemfile -
M
lib/aasm/persistence/active_record_persistence.rb -
M
spec/spec_helper.rb -
M
spec/unit/persistence/mongoid_persistance_spec.rb -
M
spec/unit/persistence/sequel_persistence_spec.rb