260b77a643
Conflicts: spec/models/validator.rb |
||
---|---|---|
.. | ||
generators | ||
models | ||
unit | ||
database.rb | ||
database.yml | ||
en.yml | ||
en_deprecated_style.yml | ||
spec_helper.rb |
260b77a643
Conflicts: spec/models/validator.rb |
||
---|---|---|
.. | ||
generators | ||
models | ||
unit | ||
database.rb | ||
database.yml | ||
en.yml | ||
en_deprecated_style.yml | ||
spec_helper.rb |