diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-29 22:33:09 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-29 22:33:09 +0000 |
commit | 20d850dac78fc11512a6ad9f3d2ad397daac3e87 (patch) | |
tree | d982ec813560600d21edfe3ad1597d2c83af1df1 /actionpack/test/fixtures/replies.yml | |
parent | 6932ae4b2978de6771e6d1c84cfc3595cf9d8bab (diff) | |
parent | b3bc4fa5e02e71a992f8a432757548c762f0aad8 (diff) | |
download | rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.tar.gz rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.tar.bz2 rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.zip |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/test/fixtures/replies.yml')
-rw-r--r-- | actionpack/test/fixtures/replies.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/fixtures/replies.yml b/actionpack/test/fixtures/replies.yml index a17d2fc42b..66020b706a 100644 --- a/actionpack/test/fixtures/replies.yml +++ b/actionpack/test/fixtures/replies.yml @@ -12,4 +12,4 @@ another: developer_id: 1 content: Nuh uh! created_at: <%= 1.hour.ago.to_s(:db) %> - updated_at: nil
\ No newline at end of file + updated_at: nil |