Merge branch 'master' of github.com:internetee/registry

Conflicts:
	db/schema.rb
This commit is contained in:
Martin Lensment 2014-08-26 13:52:39 +03:00
commit 7840e6314e
23 changed files with 361 additions and 168 deletions

View file

@ -26,11 +26,13 @@ ActiveRecord::Schema.define(version: 20140826103454) do
t.datetime "updated_at"
t.string "street2"
t.string "street3"
t.string "name"
t.string "org_name"
t.string "type"
end
create_table "contacts", force: true do |t|
t.string "code"
t.string "name"
t.string "type"
t.string "reg_no"
t.string "phone"
@ -40,7 +42,6 @@ ActiveRecord::Schema.define(version: 20140826103454) do
t.datetime "updated_at"
t.string "ident"
t.string "ident_type"
t.string "org_name"
t.integer "created_by_id"
t.integer "updated_by_id"
t.string "auth_info"