aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/MIT-LICENSE
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-08-17 21:49:16 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-08-17 21:49:16 +0530
commit9abe72c7600132aa964ca48c312ef981007ab8b1 (patch)
tree6062ada5e442186cf949df4b9a1502e84bbb0271 /activerecord/MIT-LICENSE
parentd73232c9c8933b9f3092d5d27b7ffab6ccc0422c (diff)
parentec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (diff)
downloadrails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.gz
rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.bz2
rails-9abe72c7600132aa964ca48c312ef981007ab8b1.zip
Merge branch 'master' of github.com:rails/docrails
Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
Diffstat (limited to 'activerecord/MIT-LICENSE')
0 files changed, 0 insertions, 0 deletions