Tsyren Ochirov 5e59c5cba5 Merge remote-tracking branch 'upstream/master' ... Conflicts: lib/aasm/instance_base.rb		2015-09-11 16:08:32 +02:00
..
aasm	Merge remote-tracking branch 'upstream/master'	2015-09-11 16:08:32 +02:00
aasm.rb	bugfix: avoid Rails autoloading conflicts (see #137 and #139)	2014-11-28 22:22:43 +01:00