Artur Beljajev 4f51f6c736 Merge branch 'registry-765' into registry-623 ... # Conflicts: # app/models/registrar.rb # config/locales/en.yml # spec/models/registrar_spec.rb # test/models/registrar_test.rb		2018-03-09 09:30:05 +02:00
..
admin	Merge branch 'registry-765' into registry-623	2018-03-09 09:30:05 +02:00
application	Merge branch 'master' into registry-475	2017-04-26 13:46:14 +03:00
epp	Remove unused view	2018-02-13 23:50:22 +02:00
for_models	Rename registrar's url attribute to website	2017-02-21 16:15:26 +02:00
kaminari/admin	108869472-pagination_modification	2016-04-29 14:18:44 +03:00
layouts	Load JS in async mode	2018-01-26 11:00:46 +02:00
mailers	Improve readability	2018-03-06 13:11:22 +02:00
registrant	Refactor registrars	2018-03-09 09:23:21 +02:00
registrar	Merge branch 'registry-765' into registry-623	2018-03-09 09:30:05 +02:00
shared	Story#105855968 - admin/show mark if registrar is test	2016-03-21 12:18:48 +02:00