Thorsten Böttger 6b8cca3426 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		2016-03-19 16:53:23 +13:00
..
rails_3.2_stable.gemfile	Add 'test-unit' gem to 3.2 rails Gemfile	2015-09-28 14:40:58 +05:30
rails_4.0.gemfile	Merge branch 'master' of https://github.com/javajax/aasm into javajax-master	2016-03-19 16:53:23 +13:00
rails_4.0_mongo_mapper.gemfile	Add [dynamoid](http://github.com/Veraticus/Dynamoid) support.	2016-01-10 20:34:27 +08:00
rails_4.1.gemfile	Merge branch 'master' of https://github.com/javajax/aasm into javajax-master	2016-03-19 16:53:23 +13:00
rails_4.1_mongo_mapper.gemfile	Merge pull request #300 from LeeChSien/master	2016-02-05 15:04:03 +13:00
rails_4.2.gemfile	Merge pull request #300 from LeeChSien/master	2016-02-05 15:04:03 +13:00
rails_4.2_mongo_mapper.gemfile	Merge branch 'master' of https://github.com/javajax/aasm into javajax-master	2016-03-19 16:53:23 +13:00
rails_4.2_mongoid_5.gemfile	Merge pull request #300 from LeeChSien/master	2016-02-05 15:04:03 +13:00