merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[rails.git] / config / initializers / uri.rb

# Allow generic URIs to use the registry format
silence_warnings do
  URI::Generic::USE_REGISTRY = true
end