Artur Beljajev 52feefeb79 Merge branch 'master' into refactor-messages ... # Conflicts: # app/controllers/epp/polls_controller.rb # test/fixtures/messages.yml # test/integration/epp/poll_test.rb # test/models/message_test.rb		2018-09-17 13:31:21 +03:00
..
domain	Merge branch 'master' into refactor-messages	2018-08-28 14:28:45 +03:00
login	Merge branch 'master' into refactor-devise-integration	2018-08-08 14:13:53 +03:00
logout_test.rb	Change test structure to follow closer newer Rails 5 rules	2018-07-27 09:36:27 +03:00
poll_test.rb	Merge branch 'master' into refactor-messages	2018-09-17 13:31:21 +03:00