Vladimir Krylov afd3b06f62 Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port ... # Conflicts: # app/models/domain.rb		2016-02-15 10:11:07 +02:00
..
_setting_row.haml	Story#107192666 - validation for settings that DS data allowed and Allow key data cannot be both true	2015-11-20 17:04:10 +02:00
index.haml	Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port	2016-02-15 10:11:07 +02:00