Artur Beljajev 3d6a0936c7 Merge branch 'master' into registry-251 ... # Conflicts: # doc/epp/README.md # lib/schemas/all-ee-1.1.xsd # lib/schemas/contact-ee-1.1.xsd # lib/schemas/epp-ee-1.0.xsd # spec/factories/api_user.rb # spec/rails_helper.rb # spec/support/requests/session_helpers.rb		2016-12-14 02:48:12 +02:00
..
features	Fix session helpers spec support	2016-12-08 18:55:19 +02:00
macros	Refactor rspec config and support files	2016-10-20 18:34:52 +03:00
matchers	Refactor rspec config and support files	2016-10-20 18:34:52 +03:00
requests	Merge branch 'master' into registry-251	2016-12-14 02:48:12 +02:00
capybara.rb	Refactor rspec config and support files	2016-10-20 18:34:52 +03:00
database_cleaner.rb	Refactor database cleaner config	2016-12-08 17:29:45 +02:00
paper_trail.rb	Refactor rspec config and support files	2016-10-20 18:34:52 +03:00
settings.rb	Add settings rspec support	2016-10-28 00:25:43 +03:00