zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 03:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-765

Browse source 
# Conflicts:
#	app/views/admin/registrars/show.html.erb
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-03-10 13:22:34 +02:00
commit 1b87c0bbc6
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/registrars_controller.rb
View file

@ -61,7 +61,6 @@ module Admin
:city,
:state,
:zip,
:billing_address,
:country_code,
:email,
:phone,

4
app/views/admin/registrars/show.html.erb
View file

@ -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>