Artur Beljajev 4b2948986b Merge branch 'master' into registry-790 ... # Conflicts: # test/models/domain/force_delete_test.rb # test/system/admin_area/domains/force_delete_test.rb		2018-08-24 14:54:41 +03:00
..
activatable.rb	Do not require name servers in registrar area	2016-12-29 16:27:07 +02:00
deletable.rb	Handle past domains.delete_at	2018-07-22 23:58:25 +03:00
discardable.rb	Output rake task results	2018-08-21 00:53:25 +03:00
expirable.rb	Consider domains having current time at "expire_time" attribute expired	2016-11-08 10:07:41 +02:00
force_delete.rb	Disallow scheduling "force delete" procedure on a discarded domain	2018-08-21 18:52:27 +03:00
transferable.rb	Reuse identical contacts	2018-03-05 10:59:14 +02:00