Skip to content

Commit

Permalink
Merge branch 'master' of github.com:fastladder/fastladder
Browse files Browse the repository at this point in the history
  • Loading branch information
ssig33 committed Oct 2, 2014
2 parents a327a89 + 401a87b commit 7ad161d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div id="container">
<div class="navi">
<h1 class="logo"><%= link_to "Fastladder", root_path %></h1>
<% if current_member.present? -%>
<% if current_member.present? and not current_member.errors -%>
<ul>
<li>Wellcome <%= link_to current_member.username, user_path(current_member.username) %></li>
<li><%= link_to "My Feeds", reader_path %></li>
Expand Down

0 comments on commit 7ad161d

Please sign in to comment.