diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-11 22:58:14 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-11 22:58:14 +0530 |
commit | b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0 (patch) | |
tree | 573c2401b48841a28209e93664af131146eea31e /guides/assets | |
parent | a24ef8611d19bce9c98aa21ee59d9dd0a08ecec5 (diff) | |
parent | 8a347d925d08a4fe648c6fe7c5e8c948e186c9bb (diff) | |
download | rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.gz rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.bz2 rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/action_mailer_basics.md
Diffstat (limited to 'guides/assets')
-rw-r--r-- | guides/assets/images/getting_started/unknown_action_create_for_posts.png | bin | 31314 -> 17698 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/guides/assets/images/getting_started/unknown_action_create_for_posts.png b/guides/assets/images/getting_started/unknown_action_create_for_posts.png Binary files differindex c0de53555d..d60a30465f 100644 --- a/guides/assets/images/getting_started/unknown_action_create_for_posts.png +++ b/guides/assets/images/getting_started/unknown_action_create_for_posts.png |