merge develop -Dorg -Ssuccess-only: PR 948 (improve and update server configuration documentation)
merge develop -Dorg -Ssuccess-only: PR 949 (Adding OMERO version history to docs)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 948 mtbc 'improve and update server configuration documentation'
  # PR 949 hflynn 'Adding OMERO version history to docs'

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