Merge branch 'heroku' of

Browse Source

https://github.com/luccioman/yacy_search_server.git into heroku

Conflicts:
	libbuild/GitRevMavenTask/src/GitRevMavenTask.java

pull/61/head

luccioman 9 years ago

parent 343638d98e 858dd4d80f

commit 48c2b31833

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

Show Stats Download Patch File Download Diff File

Diff Content Not Available