Merged r9417 from trunk (#10664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-20 07:45:33 +00:00
parent da1a3449ce
commit e5802895ce
14 changed files with 133 additions and 8 deletions
@@ -10,6 +10,8 @@
                                           [l(:label_registration_manual_activation), "2"],
                                           [l(:label_registration_automatic_activation), "3"]] %></p>

+<p><%= setting_check_box :unsubscribe %></p>
+
 <p><%= setting_text_field :password_min_length, :size => 6 %></p>

 <p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>