diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
| commit | 9887f238871bb2dd73de6ce8855615bcc5d8d079 (patch) | |
| tree | 74fa9ff9524a51701cfa23f708b3f777c65b7fe5 /actionpack/test/fixtures/replies.yml | |
| parent | aff821508a16245ebc03510ba29c70379718dfb7 (diff) | |
| parent | 5214e73850916de3c9127d35a4ecee0424d364a3 (diff) | |
| download | rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.gz rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.bz2 rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.zip | |
Merge branch 'master' of https://github.com/rails/rails
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 66020b706a..2a3454b8bf 100644 --- a/actionpack/test/fixtures/replies.yml +++ b/actionpack/test/fixtures/replies.yml @@ -5,7 +5,7 @@ witty_retort: content: Birdman is better! created_at: <%= 6.hours.ago.to_s(:db) %> updated_at: nil - + another: id: 2 topic_id: 2 |