diff --git a/fabfile.py b/fabfile.py index 34075ba7..311f0f11 100644 --- a/fabfile.py +++ b/fabfile.py @@ -75,7 +75,7 @@ ns.configure({ # Our custom project config. 'env': { - 'branch': 'fossy2024', + 'branch': 'fossy2025', 'app_user': 'www-data', 'db_name': 'symposion', 'project_dir': '/srv/symposion_app', diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 19217860..4bb07b28 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -369,7 +369,7 @@ AUTHENTICATION_BACKENDS = [ LOGIN_URL = '/account/login/' SESSION_EXPIRE_AT_BROWSER_CLOSE = True -CONFERENCE_ID = 3 +CONFERENCE_ID = 4 PROPOSAL_FORMS = { "ai-and-machine-learning": "pinaxcon.proposals.forms.AIAndMachineLearningProposalForm", "diversity-equity-and-inclusion": "pinaxcon.proposals.forms.DiversityEquityAndInclusionProposalForm",