Skip to content

Commit

Permalink
Merge branch 'dev' of git@github.com:ccjr/pizzaria into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
rbarazi committed Apr 20, 2010
2 parents bd5b15d + 615b0bb commit 44636e3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/products/index.html.erb
@@ -1,7 +1,7 @@
<h1>Listing products</h1>

<%= render @products %>
<%= will_paginate @prodcuts %>
<%= will_paginate @products %>
<% if current_user and current_user.admin? %>
<%= link_to 'New Product', new_product_path %>
Expand Down

0 comments on commit 44636e3

Please sign in to comment.