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

Dynaconf #2213

Merged
merged 105 commits into from
Oct 14, 2023
Merged

Dynaconf #2213

merged 105 commits into from
Oct 14, 2023

Conversation

morpheus65535
Copy link
Owner

No description provided.

morpheus65535 and others added 26 commits July 18, 2023 22:41
# Conflicts:
#	bazarr/api/system/account.py
# Conflicts:
#	bazarr/api/system/searches.py
#	bazarr/api/system/settings.py
#	bazarr/app/config.py
#	bazarr/app/database.py
#	bazarr/subtitles/download.py
#	bazarr/subtitles/indexer/movies.py
#	bazarr/subtitles/indexer/series.py
#	bazarr/subtitles/tools/score.py
#	bazarr/utilities/health.py
#	migrations/versions/dc09994b7e65_.py
# Conflicts:
#	.github/workflows/ci.yml
#	bazarr/subtitles/upgrade.py
# Conflicts:
#	bazarr/subtitles/tools/subsyncer.py
# Conflicts:
#	bazarr/app/config.py
#	bazarr/utilities/analytics.py
# Conflicts:
#	bazarr/app/config.py
@morpheus65535 morpheus65535 reopened this Oct 14, 2023
@morpheus65535 morpheus65535 merged commit c89da3e into development Oct 14, 2023
3 of 4 checks passed
@morpheus65535 morpheus65535 deleted the dynaconf branch October 15, 2023 12:44
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.

2 participants