Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync swiclops fork to current HEAD #4

Merged
merged 0 commits into from
Jan 18, 2024

Conversation

Michael-Hollister
Copy link

Before merging swiclops updates for Traefik support, the swiclops branch needs to be rebased. Feel free to merge this PR or rebase/sync the fork yourself to close the issue.

@Michael-Hollister
Copy link
Author

I cannot resolve conflicts in the swiclops branch, but in case you wish to merge this PR, you can choose the master set of changes to resolve conflicts in group_vars/matrix_servers (choose ([{'name': (devture_traefik_certs_dumper_identifier + '.service'), 'priority': 300, 'groups': ['matrix', 'traefik-certs-dumper']}] if devture_traefik_certs_dumper_enabled else [])) .

@cvwright cvwright merged commit ce883a5 into cvwright:swiclops Jan 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants