Merge branch 'contact_ident'

Conflicts:
	db/schema.rb
This commit is contained in:
Andres Keskküla 2014-07-30 12:23:21 +03:00
commit 8a4b91c3b7
8 changed files with 45 additions and 6 deletions

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20140730082358) do
ActiveRecord::Schema.define(version: 20140730082532) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -37,6 +37,7 @@ ActiveRecord::Schema.define(version: 20140730082358) do
t.datetime "created_at"
t.datetime "updated_at"
t.string "ident"
t.string "ident_type"
end
create_table "countries", force: true do |t|