diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-07-12 10:24:49 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-07-12 10:24:49 +0000 |
| commit | 46d2a517a43b6707927b6d712ae317e6960ece61 (patch) | |
| tree | 16e04af33f1734e0c626c9dec82151380d36bec2 /guides/source/_welcome.html.erb | |
| parent | 424878526276c989a02f0ae353da630d234f519c (diff) | |
| parent | d97d8379eb036e3129cd2d80deb6a026f11cd3be (diff) | |
| download | rails-46d2a517a43b6707927b6d712ae317e6960ece61.tar.gz rails-46d2a517a43b6707927b6d712ae317e6960ece61.tar.bz2 rails-46d2a517a43b6707927b6d712ae317e6960ece61.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'guides/source/_welcome.html.erb')
0 files changed, 0 insertions, 0 deletions