aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-05-19 18:30:53 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-05-19 18:30:53 +0000
commit45ee71af3c992ce6905a0a7a074da3d75e83e3d9 (patch)
treef2d3134c098fd3cf604a7a9e252b16ac6ee2e5d2 /actionpack
parentdd8c92ea5be3faa9436363d8a37d5debec2027c4 (diff)
downloadrails-45ee71af3c992ce6905a0a7a074da3d75e83e3d9.tar.gz
rails-45ee71af3c992ce6905a0a7a074da3d75e83e3d9.tar.bz2
rails-45ee71af3c992ce6905a0a7a074da3d75e83e3d9.zip
Added Serbia and Montenegro to the country_select #1239 [todd@robotcoop.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1323 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/form_options_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index dddd7016a8..96be0b8acd 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -274,8 +274,8 @@ module ActionView
"Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russia", "Rwanda",
"Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines",
"Samoa (Independent)", "San Marino", "Sao Tome and Principe", "Saudi Arabia",
- "Scotland", "Senegal", "Seychelles", "Sierra Leone", "Singapore", "Slovakia",
- "Slovenia", "Solomon Islands", "Somalia", "South Africa",
+ "Scotland", "Senegal", "Serbia and Montenegro", "Seychelles", "Sierra Leone", "Singapore",
+ "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa",
"South Georgia and the South Sandwich Islands", "South Korea", "Spain", "Sri Lanka",
"St. Helena", "St. Pierre and Miquelon", "Suriname", "Svalbard and Jan Mayen Islands",
"Swaziland", "Sweden", "Switzerland", "Taiwan", "Tajikistan", "Tanzania", "Thailand",