Merge branch 'master' of https://github.com/OWASP/railsgoat

Conflicts: Gemfile.lock
2015-02-26 09:13:15 -05:00
parent 716a16d514 b2c8e6cf8d
commit 9e7eb02cde
5 changed files with 15 additions and 3 deletions
@@ -6,7 +6,7 @@ Railsgoat::Application.routes.draw do
  get "forgot_password" => "password_resets#forgot_password"
  get "password_resets" => "password_resets#confirm_token"
  post "password_resets" => "password_resets#reset_password"
-
+  get "dashboard/doc" => "dashboard#doc"

  resources :sessions do
  end