internetee-registry/spec/mailers
Martin Lensment 412ececd9c Merge branch 'master' of github.com:domify/registry
Conflicts:
	CHANGELOG.md
	app/mailers/domain_mailer.rb
	app/models/domain.rb
	app/views/layouts/registrant/application.haml
	config/application-example.yml
	config/locales/en.yml
	config/routes.rb
	spec/mailers/domain_mailer_spec.rb
2015-05-14 18:01:06 +03:00
..
contact_mailer_spec.rb fixed email autotest 2015-05-12 18:07:52 +03:00
domain_mailer_spec.rb Merge branch 'master' of github.com:domify/registry 2015-05-14 18:01:06 +03:00