adding additional note about Django Cache
moving down in the paragraph
Merge pull request #726 from aleksandra-tarkowska/rebased/develop/setting_cache

Setting cache (rebased onto develop)
Merge pull request #727 from aleksandra-tarkowska/rebased/develop/django_update

updating omeroweb console output (rebased onto develop)
Merge pull request #728 from joshmoore/rebased/develop/5.0.1-upgrade

5.0.1 upgrade additions. (rebased onto develop)
merge develop -D org: PR 626 (Add new Squash tutorial and screenshots)
merge develop -D org: PR 724 (In-place documentation (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 729 sbesson 'Add page for Consortium CI jobs' (label: exclude)
Updating 2e7a27c..5ceaf11
Merged PRs (fast-forward):
  # PR 728 joshmoore '5.0.1 upgrade additions. (rebased onto develop)'
  # PR 727 aleksandra-tarkowska 'updating omeroweb console output (rebased onto develop)'
  # PR 726 aleksandra-tarkowska 'Setting cache (rebased onto develop)'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 724 joshmoore 'In-place documentation (rebased onto develop)'

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