diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-05-12 15:57:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-05-12 15:57:14 +0530 |
| commit | d8b8c0ef8717508c01ab21687666941008413906 (patch) | |
| tree | bc148d9244b01f88a8547b4581818abe4ec138a5 /guides/source/credits.html.erb | |
| parent | a395c22fd3f55040c041a330c14b3676bfee29fc (diff) | |
| parent | 1a9766f1280f9550ba1de4538fccd5ad51c557ac (diff) | |
| download | rails-d8b8c0ef8717508c01ab21687666941008413906.tar.gz rails-d8b8c0ef8717508c01ab21687666941008413906.tar.bz2 rails-d8b8c0ef8717508c01ab21687666941008413906.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'guides/source/credits.html.erb')
| -rw-r--r-- | guides/source/credits.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/credits.html.erb b/guides/source/credits.html.erb index 74ae7216e1..10dd8178fb 100644 --- a/guides/source/credits.html.erb +++ b/guides/source/credits.html.erb @@ -40,7 +40,7 @@ Oscar Del Ben is a software engineer at <a href="http://www.wildfireapp.com/">Wi <% end %> <%= author('Tore Darell', 'toretore') do %> - Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails and unobtrusive JavaScript. His home on the internet is his blog <a href="http://tore.darell.no">Sneaky Abstractions</a>. + Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails and unobtrusive JavaScript. His home on the Internet is his blog <a href="http://tore.darell.no">Sneaky Abstractions</a>. <% end %> <%= author('Jeff Dean', 'zilkey') do %> |