Merge remote-tracking branch 'origin/whois-contact-update' into staging

Browse source

# Conflicts:
#	app/models/contact.rb

...

This commit is contained in:

Vladimir Krylov 2016-01-18 13:19:56 +02:00

parent 7d021b1304 06b81c8f4f

commit 21eaf2c913

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files