diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
| commit | 3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (patch) | |
| tree | def6d6a808ebe187be1f37f8a739fd786cc11f02 /actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs | |
| parent | c1cbf02e3170f1004daf4a146cbc41176c2458d3 (diff) | |
| parent | 62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff) | |
| download | rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.gz rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.bz2 rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs')
| -rw-r--r-- | actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs b/actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs new file mode 100644 index 0000000000..469fcd8e15 --- /dev/null +++ b/actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs @@ -0,0 +1 @@ +page[:body].visual_effect :highlight
\ No newline at end of file |