Changeset [6b8cca3426e5c9612c8fd88737f6abeefb1aa1e4] by Thorsten Böttger
Revision 6b8cca3426e5c9612c8fd88737f6abeefb1aa1e4,
committed by Thorsten Böttger
· March 18th, 2016 @ 11:53 PM
Merge branch 'master' of https://github.com/javajax/aasm into javajax-master
Conflicts:
README.md gemfiles/rails_4.0.gemfile gemfiles/rails_4.1.gemfile
gemfiles/rails_4.2_mongo_mapper.gemfile lib/aasm/persistence.rb
https://github.com/aasm/aasm/commit/6b8cca3426e5c9612c8fd88737f6abe...
8 changed files
-
A
lib/aasm/persistence/redis_persistence.rb -
A
spec/unit/persistence/redis_persistence_spec.rb -
M
".travis.yml" -
M
README.md -
M
gemfiles/rails_4.0.gemfile -
M
gemfiles/rails_4.1.gemfile -
M
gemfiles/rails_4.2_mongo_mapper.gemfile -
M
lib/aasm/persistence.rb