Skip to content

Commit

Permalink
Merge branch 'master' of heroku.com:shindigwithme
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Silvis authored and Mike Silvis committed Jun 27, 2013
2 parents aca2e4b + dc309ec commit 4330fda
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/layouts/_navbar.html.slim
Expand Up @@ -8,7 +8,7 @@
- if current_user
a= "signed in as: #{current_user.username}"
- else
a(href="/users/auth/twitter" class='btn btn-info') Log in
a(href="/users/auth/facebook" class='btn btn-info') Log in
- if current_user
li(style="line-height:30px")
a(data-toggle="modal" href="#allEvents") Show Events

0 comments on commit 4330fda

Please sign in to comment.