Artur Beljajev f299241b28 Merge branch 'master' into registry-791 ... # Conflicts: # db/structure.sql		2018-06-21 17:38:38 +03:00
..
fixtures	Change contacts.uuid and domains.uuid to NOT NULL	2018-06-13 07:27:29 +03:00
integration	Merge branch 'replace-warden-helpers-with-devise' into registry-791	2018-06-20 12:34:31 +03:00
models	Merge branch 'master' into registry-791	2018-06-15 16:55:58 +03:00
support	Backport Rails 5 test assertions	2018-04-01 22:41:48 +03:00
test_helper.rb	Replace Warden test helpers with Devise ones	2018-06-19 19:40:35 +03:00