Merge branch '107192666-ds-key-data-dnssec' of http://github.com/internetee/registry into 107192666-ds-key-data-dnssec

Browse source

resolved conflict in app/models/dnskey.rb (EIS requires accept 256, and ds_digest_type from Settings

...

This commit is contained in:

Matt Farnsworth 2015-11-25 13:15:59 +02:00

parent 88973c5241 e5299d8835

commit ab0b32a148

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

Diff content is not available