tree 580affae79ecdf213efac1aa38f603d83672cd3d
parent e35371d4b2ffe941391922d95d96dd2cd1a1c2d5
parent 70feb2075d22e771ed9ebec987960757f26e5830
author David Pursehouse <dpursehouse@digital.ai> 1589505416 +0900
committer David Pursehouse <dpursehouse@digital.ai> 1589506108 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update git submodules
  Update git submodules
  Apply diff preferences immediately after clicking save
  Grant the InternalUser back access to changes
  Rewrite upload archive tests as real integration tests
  Add support for Elasticsearch version 7.7.*

Change-Id: I531f7336bdbe191b5d88bbc1282a59861250c897