diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-11-02 03:52:15 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-11-02 03:52:15 +0530 |
| commit | 1147453fce0890ea229c3af5f43c909ebe53061e (patch) | |
| tree | 221d816ef0c908044fd6029950ccad064866ab8f /railties/doc/guides/source/active_record_basics.txt | |
| parent | a3aa0c17ef8594a0084511f4852be7b5dc66e5e2 (diff) | |
| parent | 5a02f0bccf55191c2cfbcc69bd8165df6d7a2012 (diff) | |
| download | rails-1147453fce0890ea229c3af5f43c909ebe53061e.tar.gz rails-1147453fce0890ea229c3af5f43c909ebe53061e.tar.bz2 rails-1147453fce0890ea229c3af5f43c909ebe53061e.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/layouts_and_rendering.html
railties/doc/guides/source/active_record_basics.txt
railties/doc/guides/source/layouts_and_rendering.txt
Diffstat (limited to 'railties/doc/guides/source/active_record_basics.txt')
| -rw-r--r-- | railties/doc/guides/source/active_record_basics.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/doc/guides/source/active_record_basics.txt b/railties/doc/guides/source/active_record_basics.txt index 11a7bdb302..15fc544f25 100644 --- a/railties/doc/guides/source/active_record_basics.txt +++ b/railties/doc/guides/source/active_record_basics.txt @@ -178,4 +178,4 @@ Rails has a reputation of being a zero-config framework which means that it aim * (6) before_create * (-) create * (7) after_create - * (8) after_save
\ No newline at end of file + * (8) after_save |