diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-19 21:54:10 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-19 21:54:10 +0200 |
| commit | e162e912c9f2b3ed5789a2d262c7962a67fb6b5d (patch) | |
| tree | fbcbe9039276b5f652d143e5eb527b6fa14f2182 /actionpack/test/template/testing | |
| parent | a19c260038a9b5b688a2e8d883b604983ac59eae (diff) | |
| parent | ad602869260b4233f7471f8aa467d3b83ffeb801 (diff) | |
| download | rails-e162e912c9f2b3ed5789a2d262c7962a67fb6b5d.tar.gz rails-e162e912c9f2b3ed5789a2d262c7962a67fb6b5d.tar.bz2 rails-e162e912c9f2b3ed5789a2d262c7962a67fb6b5d.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
railties/guides/source/ajax_on_rails.textile
railties/guides/source/generators.textile
Diffstat (limited to 'actionpack/test/template/testing')
0 files changed, 0 insertions, 0 deletions