Merge develop in to openidc

NginxProxyManager / nginx-proxy-manager

Docker container for managing Nginx proxy hosts with a simple, powerful interface

https://nginxproxymanager.com

MIT License

22.61k stars 2.63k forks source link

Merge develop in to openidc #3952

Closed Trozz closed 1 week ago

Trozz commented 2 months ago

The OpenIDC branch appears to have been stale for quite a while, this merges the develop branch in to and resolves merge conflicts, normally with accepting both changes based on sensibilities (not many conflicts)

Conflicting files were

backend/templates/proxy_host.conf
docker/rootfs/etc/nginx/nginx.conf
docs/src/advanced-config/index.md
frontend/js/i18n/messages.json

jc21 commented 1 week ago

Despite it failing CI, I'll merge it anyway. I think the Jenkinsfile may be different between the branches, the one on the openidc branch shouldn't be different than the one on develop