diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /app/views/users/new.html.erb | |
parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/views/users/new.html.erb')
-rw-r--r-- | app/views/users/new.html.erb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index c23f76d..5e369ac 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -23,6 +23,8 @@ <%= f.password_field :password_confirmation %> </p> <p> + <%= show_simple_captcha %> + <%= f.submit("Be a Leaguer", :class => "signup") %> </p> <% end %> |