aboutsummaryrefslogtreecommitdiffstats
path: root/version.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-09-04 18:58:34 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-09-04 18:58:34 +0530
commitabb09054043c556ae38d2c9d1e9037eceb6dc426 (patch)
treeaa71edf8e300faa09135ba83331dffb1ab92a5d3 /version.rb
parent74372f7e795dd0e1825dec19dd128b5ae6fb9dfc (diff)
parenta6bafb327d403361ef652d6749f0609cfc2a5578 (diff)
downloadrails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.gz
rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.bz2
rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.zip
Merge docrails, resolving conflicts in the assets guide
Diffstat (limited to 'version.rb')
0 files changed, 0 insertions, 0 deletions