Merge remote-tracking branch 'origin/open-search-discovery' into open-search-discovery

Browse Source

Conflicts:
	dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/OpenSearchServlet.java

Rebase with 7bc92a81ca
Conflict on dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/OpenSearchServlet.java resolved: new version preserved

...

This commit is contained in:

Nestor Oviedo

2012-09-13 13:50:03 -03:00

parent 53ad4e36c6 58fe789f80

commit d8b1b4ccfe

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 Not Available