v7.4.1 #112

Merged

Ark74 merged 2 commits from Ark74/quick-jibri-installer:v7.4.1 into master

2024-07-17 02:14:37 +00:00

Author	SHA1	Message	Date
Luis Guzmán	98abfa7c57	fix git conflict	2024-07-16 20:13:35 -06:00
Luis Guzmán	b271402c52	qji,etherpad: fix nginx configuration and enable livestreaming by default	2024-07-16 20:09:02 -06:00