tree b076ac75aa7ccbabea6736605c758df7a3ab0b67
parent eb2e57d856d6c37c1a8fc74255ab8ef00269b1af
parent 52dacb6ccd513c96513bf064ee8b1bc8a9d3ce3b
author Luca Milanesio <luca.milanesio@gmail.com> 1578175835 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1578175835 +0000

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Disable HTTPS by default in local environment

Change-Id: I88d51b4c7242ad1d41ac12b3df479ad1884a1273