Merge branch 'patch-1' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 12 Jun 2020 21:46:16 +0000 (21:46 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 12 Jun 2020 21:46:16 +0000 (21:46 +0000)
commite2793744c5dced3ced98acb21a2ef2b13ab65ac9
treea0c46ca0f6a551028e497f8c0077a482e3d02f08
parent4115701f71a68135324c5ac04eac2e8fd7089280
parent122328b93a708e396b5c0cd1930a4b759e7b7db6
Merge branch 'patch-1' into 'develop'

Update pleroma.nginx to support TLSv1.3

See merge request pleroma/pleroma!2644