mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 17:59:47 +02:00
Conflicts: app/helpers/epp/contacts_helper.rb app/models/address.rb app/models/contact.rb db/schema.rb spec/epp/contact_spec.rb spec/fabricators/contact_fabricator.rb spec/fabricators/international_address_fabricator.rb spec/models/address_spec.rb spec/models/contact_spec.rb |
||
---|---|---|
.. | ||
20140616073945_init.rb | ||
20140620130107_create_epp_users.rb | ||
20140627082711_create_epp_sessions.rb | ||
20140701130945_add_name_dirty_to_domains.rb | ||
20140702144833_countries_table_rename.rb | ||
20140702145448_address_column_rename.rb | ||
20140724084927_add_ident_to_contact.rb | ||
20140730082358_add_reserved_domains.rb | ||
20140730082532_add_ident_type_to_contact.rb | ||
20140730104916_add_period_to_domain.rb | ||
20140730141443_add_contacts_to_domain.rb | ||
20140731073300_add_org_name_to_contact.rb | ||
20140731081816_add_nameservers_to_domain.rb | ||
20140801140249_rename_nameserver_name.rb | ||
20140804095654_add_user_stamps_to_contact.rb | ||
20140808132327_add_period_unit_to_domain.rb | ||
20140813102245_add_streets_to_address.rb | ||
20140813135408_add_ipv6_to_nameserver.rb | ||
20140815082619_create_setting_groups.rb | ||
20140815082916_create_settings.rb | ||
20140815110028_populate_settings.rb | ||
20140815114000_add_auth_info_to_contact.rb | ||
20140819095802_create_domains_statuses.rb | ||
20140819103517_populate_domain_statuses.rb | ||
20140822122938_add_postal_info_to_address.rb |