Merge branch 'master' of git://github.com/lifo/docrails
Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile
Showing
想要评论请 注册 或 登录
Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile