aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/initialization.textile
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-10-20 16:13:49 -0300
committerEmilio Tagua <miloops@gmail.com>2010-11-19 19:08:56 -0300
commit9fe0dbf8bda4d5e8fb22a80e77d04e19e1866c5f (patch)
tree9496ccde7cd04488430514b493dbd03d81baabe7 /railties/guides/source/initialization.textile
parent93daf1b80984eab80f0da13c2b42ae76b63085e3 (diff)
downloadrails-9fe0dbf8bda4d5e8fb22a80e77d04e19e1866c5f.tar.gz
rails-9fe0dbf8bda4d5e8fb22a80e77d04e19e1866c5f.tar.bz2
rails-9fe0dbf8bda4d5e8fb22a80e77d04e19e1866c5f.zip
Ups, forgot to remove one conflict tag from previous commit.
Diffstat (limited to 'railties/guides/source/initialization.textile')
0 files changed, 0 insertions, 0 deletions