mirror of
https://github.com/internetee/registry.git
synced 2025-07-23 19:20:37 +02:00
Merge branch 'master' into registry-765
# Conflicts: # app/views/admin/registrars/show.html.erb # db/structure.sql
This commit is contained in:
commit
1b87c0bbc6
8 changed files with 11 additions and 11 deletions
|
@ -61,7 +61,6 @@ module Admin
|
|||
:city,
|
||||
:state,
|
||||
:zip,
|
||||
:billing_address,
|
||||
:country_code,
|
||||
:email,
|
||||
:phone,
|
||||
|
|
|
@ -119,10 +119,10 @@
|
|||
<%= @registrar.email %>
|
||||
</dd>
|
||||
<dt>
|
||||
<%= t(:billing_address) %>
|
||||
<%= t(:billing_email) %>
|
||||
</dt>
|
||||
<dd>
|
||||
<%= @registrar.billing_address %>
|
||||
<%= @registrar.billing_email %>
|
||||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue