Permalink
Browse files

Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	railties/guides/source/getting_started.textile
  • Loading branch information...
2 parents 073609f + b084836 commit 4b189bd33695522058d3d58430d32d041560d4d8 @vrish88 vrish88 committed Jul 24, 2011
Showing with 573 additions and 214 deletions.
  1. +573 −214 railties/guides/source/getting_started.textile
Oops, something went wrong.

0 comments on commit 4b189bd

Please sign in to comment.