yacy_search_server/source/net/yacy/kelondro/data/meta
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
2016-10-14 11:29:55 +02:00
..
URIMetadataNode.java Merge branch 'master' of https://github.com/yacy/yacy_search_server.git 2016-10-14 11:29:55 +02:00