Merge branch 'master' into refactor-messages

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-08-27 20:55:04 +03:00
commit 1bfdf899a0
118 changed files with 770 additions and 581 deletions

View file

@ -2283,7 +2283,7 @@ ALTER SEQUENCE public.settings_id_seq OWNED BY public.settings.id;
CREATE TABLE public.users (
id integer NOT NULL,
username character varying,
password character varying,
plain_text_password character varying,
created_at timestamp without time zone,
updated_at timestamp without time zone,
email character varying,
@ -4760,6 +4760,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180613030330');
INSERT INTO schema_migrations (version) VALUES ('20180613045614');
INSERT INTO schema_migrations (version) VALUES ('20180713154915');
INSERT INTO schema_migrations (version) VALUES ('20180823161237');
INSERT INTO schema_migrations (version) VALUES ('20180823163548');