luccioman 6e1959f469 Merge branch 'master' of https://github.com/yacy/yacy_search_server.git ... Conflicts: htroot/yacysearchitem.java source/net/yacy/cora/federate/solr/responsewriter/YJsonResponseWriter.java source/net/yacy/search/schema/CollectionConfiguration.java source/net/yacy/server/serverObjects.java		9 years ago
..
URIMetadataNode.java	Merge branch 'master' of https://github.com/yacy/yacy_search_server.git	9 years ago