Reid Morrison 7134072568 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		2015-02-14 13:06:45 -05:00
..
aasm	Merge branch 'master' of https://github.com/aasm/aasm	2015-02-14 13:06:45 -05:00
aasm.rb	bugfix: avoid Rails autoloading conflicts (see #137 and #139)	2014-11-28 22:22:43 +01:00