merge dev_5_0 -D org: PR 862 (DropBox note)
merge dev_5_0 -D org: PR 863 (OMERO.server properties: documentation template)
merge dev_5_0 -D org: PR 866 (Document client requirements for in-place import on Windows.)
merge dev_5_0 -D org: PR 868 (5.0.3: CLI documentation)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 870 joshmoore 'New search docs' (status: error)
Already up-to-date.

Merged PRs:
  # PR 862 ximenesuk 'DropBox note'
  # PR 863 sbesson 'OMERO.server properties: documentation template'
  # PR 866 bpindelski 'Document client requirements for in-place import on Windows.'
  # PR 868 sbesson '5.0.3: CLI documentation'

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