aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/README.rdoc
diff options
context:
space:
mode:
authorMichael Lavrisha <michael.lavrisha@gmail.com>2011-07-24 14:37:22 -0600
committerMichael Lavrisha <michael.lavrisha@gmail.com>2011-07-24 14:37:22 -0600
commit073609f5e5a6238ca485185fd8961f734289e0d7 (patch)
tree15a7c987d2c1f8a25d1a1a090827904f754c01b4 /activemodel/README.rdoc
parent06b59e39a120efe173c2f2655b7f822fbf0107f0 (diff)
parent3ba30e66503cd078c58501c7d35eb9a9b54c03da (diff)
downloadrails-073609f5e5a6238ca485185fd8961f734289e0d7.tar.gz
rails-073609f5e5a6238ca485185fd8961f734289e0d7.tar.bz2
rails-073609f5e5a6238ca485185fd8961f734289e0d7.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: railties/guides/source/getting_started.textile
Diffstat (limited to 'activemodel/README.rdoc')
0 files changed, 0 insertions, 0 deletions