diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-08 21:35:17 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-08 21:35:17 +0530 |
commit | cff1d751d09e8586f47ae25416085e05ade4f7cd (patch) | |
tree | 5d01aacbc5f7b26fbcf8b3e0dca228114fcb9743 /version.rb | |
parent | 34f61f8b1ddf24e3dcc45b10536fff8eb46b3063 (diff) | |
parent | 1ffd5ec91069167043c8ecd0d949098f566d88eb (diff) | |
download | rails-cff1d751d09e8586f47ae25416085e05ade4f7cd.tar.gz rails-cff1d751d09e8586f47ae25416085e05ade4f7cd.tar.bz2 rails-cff1d751d09e8586f47ae25416085e05ade4f7cd.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
railties/guides/source/active_record_querying.textile
Diffstat (limited to 'version.rb')
0 files changed, 0 insertions, 0 deletions