aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/credits.html.erb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-09-01 23:51:23 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-09-01 23:51:23 +0530
commita6674991037fc360c7a72e7c28eec448f0231a3e (patch)
treef31b246cf779b8a09b4bc1d0db132c0e712d732b /guides/source/credits.html.erb
parent7f800b4d69c0750bb47989027580299751a22616 (diff)
parent831b814a8778aad0d038aab550b7d405d4a69d37 (diff)
downloadrails-a6674991037fc360c7a72e7c28eec448f0231a3e.tar.gz
rails-a6674991037fc360c7a72e7c28eec448f0231a3e.tar.bz2
rails-a6674991037fc360c7a72e7c28eec448f0231a3e.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source/credits.html.erb')
-rw-r--r--guides/source/credits.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/credits.html.erb b/guides/source/credits.html.erb
index 04deec6a11..e25168d58d 100644
--- a/guides/source/credits.html.erb
+++ b/guides/source/credits.html.erb
@@ -64,7 +64,7 @@ Oscar Del Ben is a software engineer at <a href="http://www.wildfireapp.com/">Wi
<% end %>
<%= author('Pratik Naik', 'lifo') do %>
- Pratik Naik is a Ruby on Rails consultant with <a href="http://www.actionrails.com">ActionRails</a> and also a member of the <a href="http://rubyonrails.org/core">Rails core team</a>. He maintains a blog at <a href="http://m.onkey.org">has_many :bugs, :through =&gt; :rails</a> and has an active <a href="http://twitter.com/lifo">twitter account</a>.
+ Pratik Naik is a Ruby on Rails developer at <a href="http://www.37signals.com">37signals</a> and also a member of the <a href="http://rubyonrails.org/core">Rails core team</a>. He maintains a blog at <a href="http://m.onkey.org">has_many :bugs, :through =&gt; :rails</a> and has a semi-active <a href="http://twitter.com/lifo">twitter account</a>.
<% end %>
<%= author('Emilio Tagua', 'miloops') do %>