server-installation: Wording matches 5.0 changes
Merge pull request #758 from hflynn/rebased/develop/api-links

Adding API doc links to OMERO docs front page (rebased onto develop)
ant: Correct property defaults
Java.txt: Correct indentation
Merge pull request #766 from rleigh-dundee/ant-propertydefaults

ant: Default all properties and handle empty vars in conf.py
Rephrasing CONTRIBUTING re: branch for PRs
Making API doc links point at release version
merge develop -D org: PR 760 (Make Ice 3.4 the minimum supported version)
merge develop -D org: PR 768 (Rephrasing CONTRIBUTING re: branch for PRs (rebased onto develop))
merge develop -D org: PR 769 (Making API doc links point at release version (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating d5bcff5..4a0f585
Merged PRs (fast-forward):
  # PR 766 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 758 hflynn 'Adding API doc links to OMERO docs front page (rebased onto develop)'

Merged PRs:
  # PR 760 rleigh-dundee 'Make Ice 3.4 the minimum supported version'
  # PR 768 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs (rebased onto develop)'
  # PR 769 hflynn 'Making API doc links point at release version (rebased onto develop)'

Generated by OMERO-5.1-merge-push#191 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/191/)