tree 315cc422207d047c3b485f48a4d072f4ed17b0d5
parent 8bfedd96663c3c83511940ce6049280360ba1d15
parent dcaf8d726b0d653634090f7b7c8bec0c161069d7
author Marcin Czech <maczech@gmail.com> 1621012408 +0200
committer Marcin Czech <maczech@gmail.com> 1621012408 +0200

Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Add dummy settings for aws credentials
  Remove unmaintained attempt to Dockerize the whole multi-site setup
  Change source instance id type from UUID to String

Change-Id: Ia0b5e826a07443bf218800cd50215b07ea534f56