Merge branch 'master' into refactor-messages

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-08-28 14:26:56 +03:00
commit aff5b68a2f
29 changed files with 297 additions and 93 deletions

View file

@ -613,7 +613,7 @@ CREATE TABLE public.contacts (
id integer NOT NULL,
code character varying NOT NULL,
phone character varying,
email character varying,
email character varying NOT NULL,
fax character varying,
created_at timestamp without time zone,
updated_at timestamp without time zone,
@ -4762,6 +4762,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180613045614');
INSERT INTO schema_migrations (version) VALUES ('20180713154915');
INSERT INTO schema_migrations (version) VALUES ('20180816123540');
INSERT INTO schema_migrations (version) VALUES ('20180823161237');
INSERT INTO schema_migrations (version) VALUES ('20180823163548');