Merge branch 'master' into registry-765

# Conflicts:
#	app/views/admin/registrars/show.html.erb
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-03-10 13:22:34 +02:00
commit 1b87c0bbc6
8 changed files with 11 additions and 11 deletions

View file

@ -2139,7 +2139,6 @@ CREATE TABLE registrars (
name character varying NOT NULL,
reg_no character varying NOT NULL,
vat_no character varying,
billing_address character varying,
created_at timestamp without time zone,
updated_at timestamp without time zone,
creator_str character varying,
@ -4696,6 +4695,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180306183540');
INSERT INTO schema_migrations (version) VALUES ('20180306183549');
INSERT INTO schema_migrations (version) VALUES ('20180308123240');
INSERT INTO schema_migrations (version) VALUES ('20180309053424');
INSERT INTO schema_migrations (version) VALUES ('20180309053921');