diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
| commit | 3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf (patch) | |
| tree | 4960911c58f2c47ecaf4f4579167270ba9c257a7 /railties/guides/source/plugins.textile | |
| parent | 1bc90044b655572a4b8aa3b323905e26d37e0f2b (diff) | |
| parent | fd83f9d51583c080072dc9fd00f02ad742e265d4 (diff) | |
| download | rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.gz rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.bz2 rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/guides/source/plugins.textile')
| -rw-r--r-- | railties/guides/source/plugins.textile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/guides/source/plugins.textile b/railties/guides/source/plugins.textile index d32e7de564..cb43282ace 100644 --- a/railties/guides/source/plugins.textile +++ b/railties/guides/source/plugins.textile @@ -1513,7 +1513,5 @@ The final plugin should have a directory structure that looks something like thi h3. Changelog -"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/32-update-plugins-guide - * April 4, 2010: Fixed document to validate XHTML 1.0 Strict. "Jaime Iniesta":http://jaimeiniesta.com * November 17, 2008: Major revision by Jeff Dean |