diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
| commit | f6797a7683e5367046217fa85900f0288a504f84 (patch) | |
| tree | f39abeafe541fe324a4264fefdd6b0fae7f9b976 /guides/source/layouts_and_rendering.md | |
| parent | 29959eb59da3cedee71d29fe84e82cfa71ad4cf3 (diff) | |
| parent | 29a64f2384f53760e9133d11a0c60e0d32ed9187 (diff) | |
| download | rails-f6797a7683e5367046217fa85900f0288a504f84.tar.gz rails-f6797a7683e5367046217fa85900f0288a504f84.tar.bz2 rails-f6797a7683e5367046217fa85900f0288a504f84.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/configuring.md
Diffstat (limited to 'guides/source/layouts_and_rendering.md')
0 files changed, 0 insertions, 0 deletions