Skip to content

Commit

Permalink
Merge branch 'master' of github.com:caelum/restfulie
Browse files Browse the repository at this point in the history
  • Loading branch information
guilhermesilveira committed Feb 16, 2011
2 parents d4c2d2b + 2ec56e8 commit 0346ac7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions site/app/views/layouts/_menu.html.erb

This file was deleted.

2 changes: 1 addition & 1 deletion site/app/views/layouts/application.html.erb
Expand Up @@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>restfulie - rest from scratch</title>
<%= stylesheet_link_tag "screen", "menu", "uppermenu", :cache => true %>
<%= stylesheet_link_tag "screen", "menu", "uppermenu" %>
<!--[if lt IE 7]>
<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE7.js" type="text/javascript"></script>
<![endif]-->
Expand Down

0 comments on commit 0346ac7

Please sign in to comment.