Merge branch 'sync-generate-zonefile-sql-with-master' into registry-475-refactor-zones

# Conflicts:
#	db/schema-read-only.rb
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2017-04-22 17:01:06 +03:00
commit cc387d9675
3 changed files with 133 additions and 7 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: 20170420125200) do
ActiveRecord::Schema.define(version: 20170422130054) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"