Artur Beljajev 837f326ef6 Merge branch 'master' into registry-623 ... # Conflicts: # app/controllers/admin/registrars_controller.rb # app/models/registrar.rb # app/views/admin/registrars/_billing.html.erb # app/views/admin/registrars/show.html.erb # config/locales/admin/registrars.en.yml # config/locales/en.yml # db/migrate/20180309053424_add_registrars_unique_constraints.rb # db/structure.sql # test/fixtures/registrars.yml # test/integration/admin/registrars/delete_test.rb # test/integration/admin/registrars/new_test.rb # test/models/registrar_test.rb		2018-03-29 12:13:59 +03:00
..
api/repp	Merge pull request #740 from internetee/registry-661	2018-03-05 12:28:43 +02:00
assets	Disable spell checking globally	2018-03-18 01:41:29 +02:00
controllers	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
helpers	Format inline	2018-03-13 14:32:17 +02:00
jobs	Do not use background job to send force delete email notification	2018-02-24 13:18:56 +02:00
mailers	Take "address_processing" setting into account in ContactMailer	2017-05-22 01:27:17 +03:00
models	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
presenters	Improve readability	2018-03-06 13:11:22 +02:00
services	Refactor registrant change mailer	2017-05-20 17:36:32 +03:00
validators	Revert "Revert "Registry 569""	2017-10-22 23:57:11 +03:00
views	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00