Permalink
Browse files

Merge branch 'master' of github.com:SciMed/temptd

  • Loading branch information...
2 parents c2faa05 + e97df5f commit 0d4f8d71f44d4b18ea78cb442fa3e1ab53a26233 Mike Simpson committed Jan 18, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 app/views/layouts/_navigation.html.erb
  2. +1 −1 config/initializers/devise.rb
@@ -1,4 +1,4 @@
-<%= link_to "Events", root_path, :class => 'brand' %>
+<%= link_to "TempTD", root_path, :class => 'brand' %>
<ul class="nav">
<% if user_signed_in? %>
@@ -203,7 +203,7 @@
# config.navigational_formats = ["*/*", :html]
# The default HTTP method used to sign out a resource. Default is :delete.
- config.sign_out_via = :get
+ config.sign_out_via = :delete
# ==> OmniAuth
# Add a new OmniAuth provider. Check the wiki for more information on setting

0 comments on commit 0d4f8d7

Please sign in to comment.