Merge branch 'master' into registry-800

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-04-17 15:09:47 +03:00
commit 22e1d09dfa
11 changed files with 10 additions and 20 deletions

View file

@ -872,7 +872,6 @@ CREATE TABLE domains (
registrar_id integer NOT NULL,
registered_at timestamp without time zone,
status character varying,
valid_from timestamp without time zone,
valid_to timestamp without time zone NOT NULL,
registrant_id integer NOT NULL,
transfer_code character varying NOT NULL,
@ -4713,5 +4712,7 @@ INSERT INTO schema_migrations (version) VALUES ('20180313124751');
INSERT INTO schema_migrations (version) VALUES ('20180314122722');
INSERT INTO schema_migrations (version) VALUES ('20180327151906');
INSERT INTO schema_migrations (version) VALUES ('20180331200125');