Skip to content

Conversation

@oharsta
Copy link
Member

@oharsta oharsta commented Dec 15, 2025

Merge Develop

Tyskai and others added 30 commits July 29, 2025 15:28
…able_account_linking

Featue toggle enable_account_linking
…feature/#1001-different-email-from-for-nudges-and-warnings
…ngs' into develop

# Conflicts:
#	roles/myconext/templates/application.yml.j2
…ror_mail-configurable-for-prod-and-non-prod-develop

#802-differentiate-error_mail-configurable-for-prod-and-non-prod-develop
@oharsta oharsta requested a review from Tyskai December 15, 2025 13:09
ricardovdheijden added a commit that referenced this pull request Jan 22, 2026
@phavekes phavekes merged commit 567c1cc into main Jan 26, 2026
2 checks passed
phavekes pushed a commit that referenced this pull request Jan 29, 2026
Fixes #OpenConext/OpenConext-manage#593

- Adds JSON log config for Manage app
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants