diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:32:41 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:32:41 -0800 |
| commit | ada895e8cac855a2f248aafdb92457365f062d07 (patch) | |
| tree | d3981be951783a72551a440b626ecd70cf7a1bf1 /railties/test/fixtures | |
| parent | 671538cd6ea0bd4c463e7bf7d238a55924a8af53 (diff) | |
| parent | f8d06e62a9084e0c862128bd9fcbb053676a007e (diff) | |
| download | rails-ada895e8cac855a2f248aafdb92457365f062d07.tar.gz rails-ada895e8cac855a2f248aafdb92457365f062d07.tar.bz2 rails-ada895e8cac855a2f248aafdb92457365f062d07.zip | |
Merge branch 'master' into mail
Diffstat (limited to 'railties/test/fixtures')
| -rw-r--r-- | railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb (renamed from railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb b/railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb index 191bdbf2fc..191bdbf2fc 100644 --- a/railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb +++ b/railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb |