mirror of
https://github.com/internetee/registry.git
synced 2025-08-01 23:42:04 +02:00
Fix merge conflicts
This commit is contained in:
commit
8a046b59bf
210 changed files with 5560 additions and 1569 deletions
|
@ -34,6 +34,7 @@
|
|||
%li= link_to t('.reserved_domains'), admin_reserved_domains_path
|
||||
%li= link_to t('.disputed_domains'), admin_disputes_path
|
||||
%li= link_to t('.mass_actions'), admin_mass_actions_path
|
||||
%li= link_to t('.bounced_email_addresses'), admin_bounced_mail_addresses_path
|
||||
%li= link_to t('.epp_log'), admin_epp_logs_path(created_after: 'today')
|
||||
%li= link_to t('.repp_log'), admin_repp_logs_path(created_after: 'today')
|
||||
%li= link_to t('.que'), '/admin/que'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue