0e51dcfb9a
Conflicts: history.txt |
||
---|---|---|
.. | ||
designs | ||
assocations_spec.rb | ||
attachment_spec.rb | ||
base_spec.rb | ||
casted_model_spec.rb | ||
casted_spec.rb | ||
class_proxy_spec.rb | ||
collection_spec.rb | ||
configuration_spec.rb | ||
designs_spec.rb | ||
inherited_spec.rb | ||
persistence_spec.rb | ||
property_protection_spec.rb | ||
property_spec.rb | ||
proxyable_spec.rb | ||
subclass_spec.rb | ||
validations_spec.rb | ||
view_spec.rb |