Merge branch 'master' into terms

[rails.git] / db / migrate / 032_add_user_locale.rb

diff --git a/db/migrate/032_add_user_locale.rb b/db/migrate/032_add_user_locale.rb
index 4d00fc1a1e4bee94c63811e9bcb818c152749cac..de3654775a7d06cf5439b2c9dd6cc0e4f9782080 100644 (file)
--- a/db/migrate/032_add_user_locale.rb
+++ b/db/migrate/032_add_user_locale.rb
@@ -1,6 +1,6 @@
 class AddUserLocale < ActiveRecord::Migration
   def self.up
 class AddUserLocale < ActiveRecord::Migration
   def self.up

-    add_column "users", "locale", :string, :default => "en", :null => false
+    add_column "users", "locale", :string

   end
 
   def self.down
   end
 
   def self.down