tree 1f928b2a0eb61b1b7fad30d77645e5ae3f94d17f
parent 31469de5990cf74d9f6918e59d58654a9e67c430
parent 4ff6c62ef5314d676025666f69e6a2f3c6bdfe30
author Fabio Ponciroli <ponch78@gmail.com> 1620396340 +0200
committer Fabio Ponciroli <ponch78@gmail.com> 1620396340 +0200

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Remove unmaintained attempt to Dockerize the whole multi-site setup

Change-Id: I1204ae4d13911543de8e9a4a979a27b052a79b7c