diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
| commit | 9044a2b051da18e9f70fd4fae55c2bd232891d1f (patch) | |
| tree | 0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4 /dist/nginx.conf | |
| parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
| parent | 49f57b55346f8e62d21a3c8bc63301038ecb796f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
Diffstat (limited to 'dist/nginx.conf')
| -rw-r--r-- | dist/nginx.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/nginx.conf b/dist/nginx.conf index 7c429bad4..b6591e897 100644 --- a/dist/nginx.conf +++ b/dist/nginx.conf @@ -19,7 +19,7 @@ server { listen [::]:443 ssl http2; server_name example.com; - ssl_protocols TLSv1.2; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; |