mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
69742ca8fa
Conflicts: activemodel/lib/active_model/core.rb activemodel/test/cases/state_machine/event_test.rb activemodel/test/cases/state_machine/state_transition_test.rb activerecord/lib/active_record/validations.rb activerecord/test/cases/validations/i18n_validation_test.rb activeresource/lib/active_resource.rb activeresource/test/abstract_unit.rb |
||
---|---|---|
.. | ||
active_model | ||
active_model.rb |