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

Conflicts: railties/guides/source/getting_started.textile

Merge branch 'master' of github.com:lifo/docrails
Conflicts: railties/guides/source/getting_started.textile
4b189bd3 · Michael Lavrisha · 073609f5 · b0848363 · 4b189bd3
展开全部隐藏空白更改
内联并排

Showing with 573 addition and 214 deletion

railties/guides/source/getting_started.textile railties/guides/source/getting_started.textile +573 -214

未找到文件。
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile