Merge branch 'master' into about-team

2019-11-09 12:39:00 -06:00
parent 23e453b89f f255fe19a4
commit 50e661dcfb
7 changed files with 23 additions and 18 deletions
--- a/nginx/020-redirects.conf
+++ b/nginx/020-redirects.conf
@ -7,6 +7,9 @@ location = /privacy-policy/ {
 location = /contact/ {
 	return 301 /about/;
 }
+location = /webrtc.html {
+	return 301 /browsers/;
+}
 location = /software/im/ {
 	return 301 /software/real-time-communication/;
 }