aboutsummaryrefslogtreecommitdiffstats
path: root/guides/assets
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-05-01 16:24:13 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-05-01 16:24:13 +0530
commit7ead1d81431b2c2c0366347b7bfdf9a329b6f934 (patch)
tree9a6a18fbb185cf2dfa48016dd32c787fe352752e /guides/assets
parent78db16d440c610edeb8b2bb37233a5991caf4a29 (diff)
parent8476932aacbc45ce38b007cca0bb3f12e741f709 (diff)
downloadrails-7ead1d81431b2c2c0366347b7bfdf9a329b6f934.tar.gz
rails-7ead1d81431b2c2c0366347b7bfdf9a329b6f934.tar.bz2
rails-7ead1d81431b2c2c0366347b7bfdf9a329b6f934.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/assets')
-rw-r--r--guides/assets/images/getting_started/challenge.png (renamed from guides/assets/images/challenge.png)bin33373 -> 33373 bytes
-rw-r--r--guides/assets/images/getting_started/rails_welcome.pngbin0 -> 50433 bytes
-rw-r--r--guides/assets/images/rails_welcome.pngbin71979 -> 0 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/guides/assets/images/challenge.png b/guides/assets/images/getting_started/challenge.png
index 30be3d7028..30be3d7028 100644
--- a/guides/assets/images/challenge.png
+++ b/guides/assets/images/getting_started/challenge.png
Binary files differ
diff --git a/guides/assets/images/getting_started/rails_welcome.png b/guides/assets/images/getting_started/rails_welcome.png
new file mode 100644
index 0000000000..569dd846a8
--- /dev/null
+++ b/guides/assets/images/getting_started/rails_welcome.png
Binary files differ
diff --git a/guides/assets/images/rails_welcome.png b/guides/assets/images/rails_welcome.png
deleted file mode 100644
index 8ad2d351de..0000000000
--- a/guides/assets/images/rails_welcome.png
+++ /dev/null
Binary files differ