Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 5 insertions, 3 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 649e022..8258394 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130122121100) do
+ActiveRecord::Schema.define(:version => 20130124125238) do
 
   create_table "access_authorizations", :force => true do |t|
     t.string   "access_authorizationable_type"
@@ -535,9 +535,11 @@ ActiveRecord::Schema.define(:version => 20130122121100) do
     t.integer  "sip_domain_id"
     t.integer  "country_id"
     t.integer  "language_id"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
     t.string   "default_area_code"
+    t.string   "default_company_name"
+    t.string   "default_system_email"
   end
 
   create_table "gs_cluster_sync_log_entries", :force => true do |t|